diff options
| author | Justin Klaassen <justinklaassen@google.com> | 2015-04-16 15:05:07 -0700 |
|---|---|---|
| committer | Justin Klaassen <justinklaassen@google.com> | 2015-04-16 15:11:42 -0700 |
| commit | 01db51b36603f5349c7a372715d22b8352ea9e8d (patch) | |
| tree | 729a26c8afb7af2315cdd2326b7ea63fc007736e /tests | |
| parent | 013969e98ce9e3eb4f87ec6159b06a74d07b2592 (diff) | |
| download | android_packages_apps_ExactCalculator-01db51b36603f5349c7a372715d22b8352ea9e8d.tar.gz android_packages_apps_ExactCalculator-01db51b36603f5349c7a372715d22b8352ea9e8d.tar.bz2 android_packages_apps_ExactCalculator-01db51b36603f5349c7a372715d22b8352ea9e8d.zip | |
Prepare ExactCalculator for master fishfood
- Switched back to using com.android.calculator2 package name.
- Setup to replace Calculator package.
- Replaced launcher icon with fishfood variant.
Change-Id: Ie3a74249e4d1808c50bfd86a3030e0ae61165c67
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Android.mk | 13 | ||||
| -rw-r--r-- | tests/AndroidManifest.xml | 6 |
2 files changed, 5 insertions, 14 deletions
diff --git a/tests/Android.mk b/tests/Android.mk index f4a73e7..8a84600 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -1,20 +1,13 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_SDK_VERSION := current - -# We only want this apk build for tests. LOCAL_MODULE_TAGS := tests -# LOCAL_JAVA_LIBRARIES := android.test.runner - -# Include all test java files. -LOCAL_SRC_FILES := $(call all-java-files-under, src) - LOCAL_PACKAGE_NAME := ExactCalculatorTests - LOCAL_INSTRUMENTATION_FOR := ExactCalculator -LOCAL_AAPT_FLAGS := --rename-manifest-package com.android.exactcalculator.tests +LOCAL_SDK_VERSION := current + +LOCAL_SRC_FILES := $(call all-java-files-under, src) include $(BUILD_PACKAGE) diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml index a6183f0..62fe5c0 100644 --- a/tests/AndroidManifest.xml +++ b/tests/AndroidManifest.xml @@ -17,14 +17,12 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.calculator2.tests"> - <uses-sdk - android:minSdkVersion="21" /> + <uses-sdk android:minSdkVersion="21" /> <instrumentation android:name="android.test.InstrumentationTestRunner" android:targetPackage="com.android.exactcalculator" - android:label="BoundedRational and Calculator Functional Test"> - </instrumentation> + android:label="BoundedRational and Calculator Functional Test" /> <application> <uses-library android:name="android.test.runner" /> |