Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 044a0b8a authored by Ying Wang's avatar Ying Wang Committed by Android (Google) Code Review
Browse files

Merge "Build all test apks as raw resource in FrameworksCoreTests."

parents 38e90751 24162fc5
Loading
Loading
Loading
Loading
+27 −2
Original line number Diff line number Diff line
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 :=
+2 −0
Original line number Diff line number Diff line
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))
+12 −0
Original line number Diff line number Diff line

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)
+2 −5
Original line number Diff line number Diff line
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)
+2 −5
Original line number Diff line number Diff line
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)
Loading