diff options
| author | Ying Wang <wangying@google.com> | 2012-01-10 15:03:28 -0800 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2012-01-10 15:12:10 -0800 |
| commit | 24162fc52c739b6d71adc8e0f9bc3768a24c5805 (patch) | |
| tree | 4d7633f765429a89b19a355e5ae965ef8205d732 /core/tests/coretests/apks | |
| parent | 251f0485440cc8202308ce6c00cbc56b207ded55 (diff) | |
| download | frameworks_base-24162fc52c739b6d71adc8e0f9bc3768a24c5805.zip frameworks_base-24162fc52c739b6d71adc8e0f9bc3768a24c5805.tar.gz frameworks_base-24162fc52c739b6d71adc8e0f9bc3768a24c5805.tar.bz2 | |
Build all test apks as raw resource in FrameworksCoreTests.
Bug: 5848975
Change-Id: I395013ded1c29e0914f72e03d0abd60bb4a7973a
Diffstat (limited to 'core/tests/coretests/apks')
11 files changed, 32 insertions, 44 deletions
diff --git a/core/tests/coretests/apks/Android.mk b/core/tests/coretests/apks/Android.mk index 4670e21..98c0c2a 100644 --- a/core/tests/coretests/apks/Android.mk +++ b/core/tests/coretests/apks/Android.mk @@ -1,5 +1,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) +FrameworkCoreTests_BUILD_PACKAGE := $(LOCAL_PATH)/FrameworkCoreTests_apk.mk + # build sub packages include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/core/tests/coretests/apks/FrameworkCoreTests_apk.mk b/core/tests/coretests/apks/FrameworkCoreTests_apk.mk new file mode 100644 index 0000000..ac545ca --- /dev/null +++ b/core/tests/coretests/apks/FrameworkCoreTests_apk.mk @@ -0,0 +1,12 @@ + +LOCAL_MODULE_TAGS := tests + +# Disable dexpreopt. +LOCAL_DEX_PREOPT := false + +# Make sure every package name gets the FrameworkCoreTests_ prefix. +LOCAL_PACKAGE_NAME := FrameworkCoreTests_$(LOCAL_PACKAGE_NAME) + +FrameworkCoreTests_all_apks += $(LOCAL_PACKAGE_NAME) + +include $(BUILD_PACKAGE) diff --git a/core/tests/coretests/apks/install_decl_perm/Android.mk b/core/tests/coretests/apks/install_decl_perm/Android.mk index c38e981..86370c8 100644 --- a/core/tests/coretests/apks/install_decl_perm/Android.mk +++ b/core/tests/coretests/apks/install_decl_perm/Android.mk @@ -1,11 +1,8 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE_TAGS := tests - LOCAL_SRC_FILES := $(call all-subdir-java-files) -LOCAL_PACKAGE_NAME := FrameworkCoreTests_install_decl_perm - -include $(BUILD_PACKAGE) +LOCAL_PACKAGE_NAME := install_decl_perm +include $(FrameworkCoreTests_BUILD_PACKAGE) diff --git a/core/tests/coretests/apks/install_loc_auto/Android.mk b/core/tests/coretests/apks/install_loc_auto/Android.mk index 2deb978..6435f36 100644 --- a/core/tests/coretests/apks/install_loc_auto/Android.mk +++ b/core/tests/coretests/apks/install_loc_auto/Android.mk @@ -1,11 +1,8 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE_TAGS := tests - LOCAL_SRC_FILES := $(call all-subdir-java-files) -LOCAL_PACKAGE_NAME := FrameworkCoreTests_install_loc_auto - -include $(BUILD_PACKAGE) +LOCAL_PACKAGE_NAME := install_loc_auto +include $(FrameworkCoreTests_BUILD_PACKAGE) diff --git a/core/tests/coretests/apks/install_loc_internal/Android.mk b/core/tests/coretests/apks/install_loc_internal/Android.mk index 784bf0a..8cc8b8e 100644 --- a/core/tests/coretests/apks/install_loc_internal/Android.mk +++ b/core/tests/coretests/apks/install_loc_internal/Android.mk @@ -1,11 +1,8 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE_TAGS := tests - LOCAL_SRC_FILES := $(call all-subdir-java-files) -LOCAL_PACKAGE_NAME := FrameworkCoreTests_install_loc_internal - -include $(BUILD_PACKAGE) +LOCAL_PACKAGE_NAME := install_loc_internal +include $(FrameworkCoreTests_BUILD_PACKAGE) diff --git a/core/tests/coretests/apks/install_loc_sdcard/Android.mk b/core/tests/coretests/apks/install_loc_sdcard/Android.mk index 4eea322..e1411c2 100644 --- a/core/tests/coretests/apks/install_loc_sdcard/Android.mk +++ b/core/tests/coretests/apks/install_loc_sdcard/Android.mk @@ -1,11 +1,8 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE_TAGS := tests - LOCAL_SRC_FILES := $(call all-subdir-java-files) -LOCAL_PACKAGE_NAME := FrameworkCoreTests_install_loc_sdcard - -include $(BUILD_PACKAGE) +LOCAL_PACKAGE_NAME := install_loc_sdcard +include $(FrameworkCoreTests_BUILD_PACKAGE) diff --git a/core/tests/coretests/apks/install_loc_unspecified/Android.mk b/core/tests/coretests/apks/install_loc_unspecified/Android.mk index 206c99f..0741d04 100644 --- a/core/tests/coretests/apks/install_loc_unspecified/Android.mk +++ b/core/tests/coretests/apks/install_loc_unspecified/Android.mk @@ -1,11 +1,8 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE_TAGS := tests - LOCAL_SRC_FILES := $(call all-subdir-java-files) -LOCAL_PACKAGE_NAME := FrameworkCoreTests_install_loc_unspecified - -include $(BUILD_PACKAGE) +LOCAL_PACKAGE_NAME := install_loc_unspecified +include $(FrameworkCoreTests_BUILD_PACKAGE) diff --git a/core/tests/coretests/apks/install_use_perm_good/Android.mk b/core/tests/coretests/apks/install_use_perm_good/Android.mk index 1a07fc8..e2661a1 100644 --- a/core/tests/coretests/apks/install_use_perm_good/Android.mk +++ b/core/tests/coretests/apks/install_use_perm_good/Android.mk @@ -1,11 +1,8 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE_TAGS := tests - LOCAL_SRC_FILES := $(call all-subdir-java-files) -LOCAL_PACKAGE_NAME := FrameworkCoreTests_install_use_perm_good - -include $(BUILD_PACKAGE) +LOCAL_PACKAGE_NAME := install_use_perm_good +include $(FrameworkCoreTests_BUILD_PACKAGE) diff --git a/core/tests/coretests/apks/install_uses_feature/Android.mk b/core/tests/coretests/apks/install_uses_feature/Android.mk index c0a5067..b60d734 100644 --- a/core/tests/coretests/apks/install_uses_feature/Android.mk +++ b/core/tests/coretests/apks/install_uses_feature/Android.mk @@ -1,11 +1,8 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE_TAGS := tests - LOCAL_SRC_FILES := $(call all-subdir-java-files) -LOCAL_PACKAGE_NAME := FrameworkCoreTests_install_uses_feature - -include $(BUILD_PACKAGE) +LOCAL_PACKAGE_NAME := install_uses_feature +include $(FrameworkCoreTests_BUILD_PACKAGE) diff --git a/core/tests/coretests/apks/install_verifier_bad/Android.mk b/core/tests/coretests/apks/install_verifier_bad/Android.mk index b50cfd0..a6f9d5b 100644 --- a/core/tests/coretests/apks/install_verifier_bad/Android.mk +++ b/core/tests/coretests/apks/install_verifier_bad/Android.mk @@ -1,11 +1,8 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE_TAGS := tests - LOCAL_SRC_FILES := $(call all-subdir-java-files) -LOCAL_PACKAGE_NAME := FrameworkCoreTests_install_verifier_bad - -include $(BUILD_PACKAGE) +LOCAL_PACKAGE_NAME := install_verifier_bad +include $(FrameworkCoreTests_BUILD_PACKAGE) diff --git a/core/tests/coretests/apks/install_verifier_good/Android.mk b/core/tests/coretests/apks/install_verifier_good/Android.mk index a48a80e..6f2d44f 100644 --- a/core/tests/coretests/apks/install_verifier_good/Android.mk +++ b/core/tests/coretests/apks/install_verifier_good/Android.mk @@ -1,10 +1,8 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE_TAGS := tests - LOCAL_SRC_FILES := $(call all-subdir-java-files) -LOCAL_PACKAGE_NAME := FrameworkCoreTests_install_verifier_good +LOCAL_PACKAGE_NAME := install_verifier_good -include $(BUILD_PACKAGE) +include $(FrameworkCoreTests_BUILD_PACKAGE) |