Rename is_unbundled_app_build and UNBUNDLED_APP_BUILD to TARGET_BUILD_APPS. (16fa4b29) · Commits · e / os / android_build

core/envsetup.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -342,6 +342,7 @@ $(info TARGET_PRODUCT=$(TARGET_PRODUCT))
		$(info TARGET_BUILD_VARIANT=$(TARGET_BUILD_VARIANT))
		$(info TARGET_SIMULATOR=$(TARGET_SIMULATOR))
		$(info TARGET_BUILD_TYPE=$(TARGET_BUILD_TYPE))
		$(info TARGET_BUILD_APPS=$(TARGET_BUILD_APPS))
		$(info TARGET_ARCH=$(TARGET_ARCH))
		$(info HOST_ARCH=$(HOST_ARCH))
		$(info HOST_OS=$(HOST_OS))

core/main.mk

+44 −43

Original line number	Diff line number	Diff line
		@@ -688,22 +688,31 @@ droidcore: files \

		# The actual files built by the droidcore target changes depending
		# on the build variant.
		.PHONY: droid tests
		ifeq ($(strip $(is_unbundled_app_build)),true)
		ifneq ($(TARGET_BUILD_APPS),)
		unbundled_build_modules :=
		ifdef UNBUNDLED_APPS
		unbundled_build_modules := $(UNBUNDLED_APPS)
		else # UNBUNDLED_APPS
		# Otherwise we build all modules in the source tree.
		ifneq ($(filter all,$(TARGET_BUILD_APPS)),)
		# If they used the magic goal "all" then build everything
		unbundled_build_modules := $(sort $(call get-tagged-modules,$(ALL_MODULE_TAGS)))
		endif # UNBUNDLED_APPS
		droid: $(unbundled_build_modules)
		else # is_unbundled_app_build
		droid: droidcore
		endif # is_unbundled_app_build
		else
		unbundled_build_modules := $(TARGET_BUILD_APPS)
		endif
		default_goal_deps := $(unbundled_build_modules)
		else # TARGET_BUILD_APPS
		default_goal_deps := droidcore
		endif # TARGET_BUILD_APPS

		.PHONY: droid tests
		droid: $(default_goal_deps)
		tests: droidcore

		ifneq ($(strip $(is_unbundled_app_build)),true)
		ifneq ($(TARGET_BUILD_APPS),)
		# dist the unbundled app.
		$(call dist-for-goals,droid, \
		$(foreach m,$(unbundled_build_modules),$(ALL_MODULES.$(m).INSTALLED)) \
		)

		else # TARGET_BUILD_APPS

		$(call dist-for-goals, droid, \
		$(INTERNAL_UPDATE_PACKAGE_TARGET) \
		$(INTERNAL_OTA_PACKAGE_TARGET) \
		@@ -727,15 +736,7 @@ $(call dist-for-goals, droid, \
		$(BUILT_TESTS_ZIP_PACKAGE) \
		)
		endif

		else # is_unbundled_app_build
		# dist the unbundled app.
		ifdef UNBUNDLED_APPS
		$(call dist-for-goals,droid, \
		$(foreach m,$(UNBUNDLED_APPS),$(ALL_MODULES.$(m).INSTALLED)) \
		)
		endif # UNBUNDLED_APPS
		endif # is_unbundled_app_build
		endif # TARGET_BUILD_APPS

		.PHONY: docs
		docs: $(ALL_DOCS)

core/package.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -311,7 +311,7 @@ PACKAGES.$(LOCAL_PACKAGE_NAME).CERTIFICATE := $(certificate)
		# Define the rule to build the actual package.
		$(LOCAL_BUILT_MODULE): $(AAPT) \| $(ZIPALIGN)
		$(LOCAL_BUILT_MODULE): PRIVATE_JNI_SHARED_LIBRARIES := $(jni_shared_libraries)
		ifeq ($(strip $(is_unbundled_app_build)),true)
		ifneq ($(TARGET_BUILD_APPS),)
		# Include all resources for unbundled apps.
		$(LOCAL_BUILT_MODULE): PRODUCT_AAPT_CONFIG :=
		endif

core/product_config.mk

+3 −4

Original line number	Diff line number	Diff line
		@@ -157,13 +157,12 @@ ifdef unbundled_goals
		ifneq ($(words $(unbundled_goals)),1)
		$(error Only one APP-* goal may be specified; saw "$(unbundled_goals)"))
		endif
		UNBUNDLED_APPS := $(strip $(subst -, ,$(patsubst APP-%,%,$(unbundled_goals))))
		TARGET_BUILD_APPS := $(strip $(subst -, ,$(patsubst APP-%,%,$(unbundled_goals))))
		ifneq ($(filter $(DEFAULT_GOAL),$(MAKECMDGOALS)),)
		MAKECMDGOALS := $(patsubst $(unbundled_goals),,$(MAKECMDGOALS))
		else
		MAKECMDGOALS := $(patsubst $(unbundled_goals),$(DEFAULT_GOAL),$(MAKECMDGOALS))
		endif
		is_unbundled_app_build := true

		.PHONY: $(unbundled_goals)
		$(unbundled_goals): $(MAKECMDGOALS)
		@@ -178,7 +177,7 @@ include $(BUILD_SYSTEM)/node_fns.mk
		include $(BUILD_SYSTEM)/product.mk
		include $(BUILD_SYSTEM)/device.mk

		ifeq ($(strip $(is_unbundled_app_build)),true)
		ifneq ($(strip $(TARGET_BUILD_APPS)),)
		# An unbundled app build needs only the core product makefiles.
		$(call import-products,$(call get-product-makefiles,\
		$(SRC_TARGET_DIR)/product/AndroidProducts.mk))
		@@ -189,7 +188,7 @@ else
		#TODO: when we start allowing direct pointers to product files,
		# guarantee that they're in this list.
		$(call import-products, $(get-all-product-makefiles))
		endif # is_unbundled_app_build
		endif # TARGET_BUILD_APPS
		$(check-all-products)
		#$(dump-products)
		#$(error done)

target/product/AndroidProducts.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -25,8 +25,8 @@
		# it includes.
		#

		ifeq ($(strip $(is_unbundled_app_build)),true)
		# An unbundled app build needs only generic.mk.
		ifneq ($(TARGET_BUILD_APPS),)
		PRODUCT_MAKEFILES := \
		$(LOCAL_DIR)/core.mk \
		$(LOCAL_DIR)/generic.mk