From 589e3bc83c071cddfa72917e9ac3b213d3fb5dfc Mon Sep 17 00:00:00 2001 From: Nelson Li Date: Tue, 5 Mar 2024 02:55:42 +0000 Subject: [PATCH] Move frameworks/base/Android.mk to build/tasks 1. Move the work of `declare-1p-copy-files` to `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 main work of generating the targets `docs`, `offline-sdk-docs`, and `framework-doc-stubs` to `framework_library.mk`. Because Soong cannot specify the output to paths such as `$(OUT_DOCS)/` and `framework-doc-stubs-metadata_intermediates/`. 5. `ANDROID_BUILD_EMBEDDED` can theoretically be removed because the `.mk` files that use this variable are not currently in use, but since it involves many other files that are unrelated to this task, the work of removing this variable will be moved to other changes. Bug: 322732227 Test: m docs offline-sdk-docs framework-doc-stubs Change-Id: Ie51dbf88c78861fc60c6ba9c40542455e4cd4f55 --- core/tasks/framework_library.mk | 51 +++++++++++++++++++++++++++++++++ core/tasks/meta-lic.mk | 9 ++++++ 2 files changed, 60 insertions(+) create mode 100644 core/tasks/framework_library.mk diff --git a/core/tasks/framework_library.mk b/core/tasks/framework_library.mk new file mode 100644 index 0000000000..0bf485445c --- /dev/null +++ b/core/tasks/framework_library.mk @@ -0,0 +1,51 @@ +# +# Copyright (C) 2008 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# embedded builds use nothing in frameworks/base +ifneq ($(ANDROID_BUILD_EMBEDDED),true) + +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) + +endif # ANDROID_BUILD_EMBEDDED diff --git a/core/tasks/meta-lic.mk b/core/tasks/meta-lic.mk index 0079714ac3..dea4892211 100644 --- a/core/tasks/meta-lic.mk +++ b/core/tasks/meta-lic.mk @@ -21,3 +21,12 @@ $(eval $(call declare-1p-copy-files,frameworks/av/media/libstagefright,)) # Moved here from frameworks/av/services/Android.mk $(eval $(call declare-1p-copy-files,frameworks/av/services/audiopolicy,)) + +# Moved here from frameworks/base/Android.mk +$(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,))