diff options
| author | Nelson Li <nelsonli@google.com> | 2024-03-06 03:33:13 +0000 |
|---|---|---|
| committer | Nelson Li <nelsonli@google.com> | 2024-03-06 03:35:34 +0000 |
| commit | f4f1c8c5795f71fffa6ebb7660e7654a7ff2bd0a (patch) | |
| tree | a033504cb52d8c57f672b9a27abe2c48fc706b5b | |
| parent | 9148f7eef73180645863ead0c26052543d632d6c (diff) | |
| download | base-f4f1c8c5795f71fffa6ebb7660e7654a7ff2bd0a.tar.gz | |
Revert "Move frameworks/base/Android.mk to build/tasks"
Revert submission 2988149-framework_library
Reason for revert: Broken build 11534795 on git_aosp-main-future on sdk-next-userdebug
Reverted changes: /q/submissionid:2988149-framework_library
Change-Id: I9a514adb63565e0fe1d40b0b9ec3bc305fbc9cc3
Bug: 328325889
Bug: 328326210
| -rw-r--r-- | Android.mk | 65 |
1 files changed, 63 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk index 81284d54b93a..e2c1ed8e9ddb 100644 --- a/Android.mk +++ b/Android.mk @@ -15,6 +15,67 @@ # LOCAL_PATH := $(call my-dir) -# TODO: Removed it after all Android.mk files in the subdirectories are -# converted to Android.bp. +$(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)) include $(call first-makefiles-under,$(LOCAL_PATH)) +endif + +endif # ANDROID_BUILD_EMBEDDED |