Bug 1159390 - Set sharedUserId in robocop.apk. r=gbrown

build/mobile/robocop/AndroidManifest.xml.in

@@ -2,6 +2,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.mozilla.roboexample.test"
+#ifdef MOZ_ANDROID_SHARED_ID
+    android:sharedUserId="@MOZ_ANDROID_SHARED_ID@"
+#endif
     android:versionCode="1"
     android:versionName="1.0" >
 

build/mobile/robocop/Makefile.in

@@ -39,14 +39,19 @@ java-tests   := \
   $(wildcard $(TESTPATH)/components/*.java) \
   $(wildcard $(TESTPATH)/helpers/*.java)
 
-PP_TARGETS        += manifest
-manifest          := $(srcdir)/AndroidManifest.xml.in
-manifest_TARGET   := AndroidManifest.xml
+PP_TARGETS += manifest
+manifest := $(srcdir)/AndroidManifest.xml.in
+manifest_TARGET := export
+manifest_FLAGS += \
+  -DMOZ_ANDROID_SHARED_ID='$(ANDROID_PACKAGE_NAME).sharedID' \
+  -DMOZ_ANDROID_SHARED_ACCOUNT_TYPE='$(ANDROID_PACKAGE_NAME)_sync' \
+  $(NULL)
+
 ANDROID_MANIFEST_FILE := $(CURDIR)/AndroidManifest.xml
 
 # Install robocop configs and helper
 INSTALL_TARGETS += robocop
-robocop_TARGET  := libs
+robocop_TARGET  := export
 robocop_DEST    := $(CURDIR)
 robocop_FILES   := \
   $(TESTPATH)/robocop.ini \
@@ -68,7 +73,8 @@ ROBOCOP_FILES := \
   $(wildcard $(TESTPATH)/reader_mode_pages) \
   $(NULL)
 
-ROBOCOP_DEST = $(DEPTH)/_tests/testing/mochitest/tests/robocop/
+ROBOCOP_DEST := $(DEPTH)/_tests/testing/mochitest/tests/robocop/
+ROBOCOP_TARGET := export
 INSTALL_TARGETS += ROBOCOP
 
 GARBAGE += \

mobile/android/mach_commands.py

@@ -54,6 +54,7 @@ class MachCommands(MachCommandBase):
             ensure_exit_code=False, # Don't throw on non-zero exit code.
             cwd=mozpath.join(self.topobjdir, 'mobile', 'android', 'gradle'))
 
+
     @Command('gradle-install', category='devenv',
         description='Install gradle environment.',
         conditions=[conditions.is_android])
@@ -115,6 +116,7 @@ class MachCommands(MachCommandBase):
 
         srcdir('app/build.gradle', 'mobile/android/gradle/app/build.gradle')
         objdir('app/src/main/AndroidManifest.xml', 'mobile/android/base/AndroidManifest.xml')
+        objdir('app/src/androidTest/AndroidManifest.xml', 'build/mobile/robocop/AndroidManifest.xml')
         srcdir('app/src/androidTest/res', 'build/mobile/robocop/res')
         srcdir('app/src/androidTest/assets', 'mobile/android/base/tests/assets')
         objdir('app/src/debug/assets', 'dist/fennec/assets')