diff options
19 files changed, 59 insertions, 46 deletions
diff --git a/core/tests/coretests/Android.mk b/core/tests/coretests/Android.mk index b2ebb08..b81f774 100644 --- a/core/tests/coretests/Android.mk +++ b/core/tests/coretests/Android.mk @@ -1,4 +1,14 @@ -LOCAL_PATH:= $(call my-dir) +ACTUAL_LOCAL_PATH := $(call my-dir) + +# this var will hold all the test apk module names later. +FrameworkCoreTests_all_apks := + +# We have to include the subdir makefiles first +# so that FrameworkCoreTests_all_apks will be populated correctly. +include $(call all-makefiles-under,$(ACTUAL_LOCAL_PATH)) + +LOCAL_PATH := $(ACTUAL_LOCAL_PATH) + include $(CLEAR_VARS) # We only want this apk build for tests. @@ -18,6 +28,21 @@ LOCAL_PACKAGE_NAME := FrameworksCoreTests LOCAL_CERTIFICATE := platform +# intermediate dir to include all the test apks as raw resource +FrameworkCoreTests_intermediates := $(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME))/test_apks/res +LOCAL_RESOURCE_DIR := $(FrameworkCoreTests_intermediates) $(LOCAL_PATH)/res + include $(BUILD_PACKAGE) +# Rules to copy all the test apks to the intermediate raw resource directory +FrameworkCoreTests_all_apks_res := $(addprefix $(FrameworkCoreTests_intermediates)/raw/, \ + $(foreach a, $(FrameworkCoreTests_all_apks), $(patsubst FrameworkCoreTests_%,%,$(a)))) + +$(FrameworkCoreTests_all_apks_res): $(FrameworkCoreTests_intermediates)/raw/%: $(call intermediates-dir-for,APPS,FrameworkCoreTests_%)/package.apk | $(ACP) + $(call copy-file-to-new-target) + +# Use R_file_stamp as dependency because we want the test apks in place before the R.java is generated. +$(R_file_stamp) : $(FrameworkCoreTests_all_apks_res) -include $(call all-makefiles-under,$(LOCAL_PATH)) +FrameworkCoreTests_all_apks := +FrameworkCoreTests_intermediates := +FrameworkCoreTests_all_apks_res := 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) diff --git a/core/tests/coretests/res/raw/install_decl_perm b/core/tests/coretests/res/raw/install_decl_perm Binary files differdeleted file mode 100644 index af05d81..0000000 --- a/core/tests/coretests/res/raw/install_decl_perm +++ /dev/null diff --git a/core/tests/coretests/res/raw/install_loc_auto b/core/tests/coretests/res/raw/install_loc_auto Binary files differdeleted file mode 100644 index 63bf35c..0000000 --- a/core/tests/coretests/res/raw/install_loc_auto +++ /dev/null diff --git a/core/tests/coretests/res/raw/install_loc_internal b/core/tests/coretests/res/raw/install_loc_internal Binary files differdeleted file mode 100644 index 5178803..0000000 --- a/core/tests/coretests/res/raw/install_loc_internal +++ /dev/null diff --git a/core/tests/coretests/res/raw/install_loc_sdcard b/core/tests/coretests/res/raw/install_loc_sdcard Binary files differdeleted file mode 100644 index 013a414..0000000 --- a/core/tests/coretests/res/raw/install_loc_sdcard +++ /dev/null diff --git a/core/tests/coretests/res/raw/install_loc_unspecified b/core/tests/coretests/res/raw/install_loc_unspecified Binary files differdeleted file mode 100644 index 06981f4..0000000 --- a/core/tests/coretests/res/raw/install_loc_unspecified +++ /dev/null diff --git a/core/tests/coretests/res/raw/install_use_perm_good b/core/tests/coretests/res/raw/install_use_perm_good Binary files differdeleted file mode 100644 index a7eb32f..0000000 --- a/core/tests/coretests/res/raw/install_use_perm_good +++ /dev/null diff --git a/core/tests/coretests/res/raw/install_uses_feature b/core/tests/coretests/res/raw/install_uses_feature Binary files differdeleted file mode 100644 index eeeb309..0000000 --- a/core/tests/coretests/res/raw/install_uses_feature +++ /dev/null |