From e9a7cb0bd5e95b29aa1b444816a5fc4d49b6c49b Mon Sep 17 00:00:00 2001 From: Nelson Li Date: Thu, 7 Mar 2024 08:03:06 +0000 Subject: Move frameworks/base/Android.mk to build/core 1. Move the work of `declare-1p-copy-files` to `build/core/tasks/meta-lic.mk`. 2. Remove `$(LOCAL_PATH)/pathmap.mk` because the variables defined in it are no longer used. 3. The variable `ONE_SHOT_MAKEFILE` is deprecated and can be removed directly. 4. Move the work of `offline-sdk-docs` to `build/core/tasks/offline-sdk-docs.mk` because Soong cannot specify the output path to `$(OUT_DOCS)/`. 5. Move the work of `framework-doc-stubs` to `build/core/Makefile` because Soong cannot specify the output path to `framework-doc-stubs-metadata_intermediates`, and because `SDK_METADATA_FILES` is a dependency of the SDK, it must be moved before the SDK's dependencies are determined, and it cannot be moved to `build/core/tasks`. 6. `ANDROID_BUILD_EMBEDDED` can be removed because the `.mk` files that use this variable are currently not used. Bug: 322732227 Test: m sdk docs offline-sdk-docs framework-doc-stubs Change-Id: Id11f96f0b1af55559b88322d480977976ab0b4ce --- Android.mk | 65 ++------------------------------------------------------------ 1 file changed, 2 insertions(+), 63 deletions(-) diff --git a/Android.mk b/Android.mk index e2c1ed8e9ddb..a126c52e2491 100644 --- a/Android.mk +++ b/Android.mk @@ -15,67 +15,6 @@ # LOCAL_PATH := $(call my-dir) -$(eval $(call declare-1p-copy-files,frameworks/base,.ogg)) -$(eval $(call declare-1p-copy-files,frameworks/base,.kl)) -$(eval $(call declare-1p-copy-files,frameworks/base,.kcm)) -$(eval $(call declare-1p-copy-files,frameworks/base,.idc)) -$(eval $(call declare-1p-copy-files,frameworks/base,dirty-image-objects)) -$(eval $(call declare-1p-copy-files,frameworks/base/config,)) -$(eval $(call declare-1p-copy-files,frameworks/native/data,)) - -# Load framework-specific path mappings used later in the build. -include $(LOCAL_PATH)/pathmap.mk - -# Build the master framework library. -# The framework contains too many method references (>64K) for poor old DEX. -# So we first build the framework as a monolithic static library then split it -# up into smaller pieces. -# ============================================================ - -# embedded builds use nothing in frameworks/base -ifneq ($(ANDROID_BUILD_EMBEDDED),true) - -# Copy AIDL files to be preprocessed and included in the SDK, -# specified relative to the root of the build tree. -# ============================================================ -include $(CLEAR_VARS) - -# sdk.atree needs to copy the whole dir: $(OUT_DOCS)/offline-sdk to the final zip. -# So keep offline-sdk-timestamp target here, and unzip offline-sdk-docs.zip to -# $(OUT_DOCS)/offline-sdk. -$(OUT_DOCS)/offline-sdk-timestamp: $(OUT_DOCS)/offline-sdk-docs-docs.zip - $(hide) rm -rf $(OUT_DOCS)/offline-sdk - $(hide) mkdir -p $(OUT_DOCS)/offline-sdk - ( unzip -qo $< -d $(OUT_DOCS)/offline-sdk && touch -f $@ ) || exit 1 - -.PHONY: docs offline-sdk-docs -docs offline-sdk-docs: $(OUT_DOCS)/offline-sdk-timestamp - -SDK_METADATA_DIR :=$= $(call intermediates-dir-for,PACKAGING,framework-doc-stubs-metadata,,COMMON) -SDK_METADATA_FILES :=$= $(addprefix $(SDK_METADATA_DIR)/,\ - activity_actions.txt \ - broadcast_actions.txt \ - categories.txt \ - features.txt \ - service_actions.txt \ - widgets.txt) -SDK_METADATA :=$= $(firstword $(SDK_METADATA_FILES)) -$(SDK_METADATA): .KATI_IMPLICIT_OUTPUTS := $(filter-out $(SDK_METADATA),$(SDK_METADATA_FILES)) -$(SDK_METADATA): $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/framework-doc-stubs-metadata.zip - rm -rf $(SDK_METADATA_DIR) - mkdir -p $(SDK_METADATA_DIR) - unzip -DDqo $< -d $(SDK_METADATA_DIR) - -.PHONY: framework-doc-stubs -framework-doc-stubs: $(SDK_METADATA) - -# Include subdirectory makefiles -# ============================================================ - -# If we're building with ONE_SHOT_MAKEFILE (mm, mmm), then what the framework -# team really wants is to build the stuff defined by this makefile. -ifeq (,$(ONE_SHOT_MAKEFILE)) +# TODO: Empty this file after all subdirectories' Android.mk have been +# converted to Android.bp to avoid using any newly added Android.mk. include $(call first-makefiles-under,$(LOCAL_PATH)) -endif - -endif # ANDROID_BUILD_EMBEDDED -- cgit v1.2.3-59-g8ed1b