PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of 111b81d to master

Browse Source 
Change-Id: I2b7eb6dfe73a94b6acd5ef47690ee72022b1ad6d
This commit is contained in:
Fan Zhang
2016-08-22 17:26:34 -07:00
parent c721a4e2f9 111b81dc79
commit d0f2f3dee5
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/app/Android.mk
View File

@@ -8,9 +8,9 @@ LOCAL_CERTIFICATE := platform
LOCAL_JAVA_LIBRARIES := android.test.runner bouncycastle LOCAL_JAVA_LIBRARIES := android.test.runner bouncycastle
LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-test \ android-support-test \
mockito-target \ mockito-target \
espresso-core espresso-core
# Include all test java files. # Include all test java files.
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)

4
tests/app/AndroidManifest.xml
View File

@@ -52,8 +52,8 @@
</application> </application>
<instrumentation android:name="android.support.test.runner.AndroidJUnitRunner" <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
android:targetPackage="com.android.settings" android:targetPackage="com.android.settings"
android:label="Settings Test Cases"> android:label="Settings Test Cases">
</instrumentation> </instrumentation>
<instrumentation android:name="SettingsLaunchPerformance" <instrumentation android:name="SettingsLaunchPerformance"

6
tests/unit/Android.mk
View File

@@ -8,9 +8,9 @@ LOCAL_CERTIFICATE := platform
LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_JAVA_LIBRARIES := android.test.runner
LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-test \ android-support-test \
mockito-target \ mockito-target \
espresso-core espresso-core
# Include all test java files. # Include all test java files.
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)