diff options
| author | Clinton Ke <clintonke@google.com> | 2024-03-06 04:21:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-03-06 04:21:11 +0000 |
| commit | 8a65d6626970c9fc83ca4332297df92a8303a0ae (patch) | |
| tree | 349105cfcaf2f5907fa9d7c558dc323f1dd79c25 | |
| parent | 2aba12de46dcddbeeaf9dfc3223ff1b22c88792a (diff) | |
| parent | 3ac66146666f59149e499c013ff5055014e362e0 (diff) | |
| download | build-temp_319669529.tar.gz | |
Merge "Revert "Move frameworks/base/Android.mk to build/tasks"" into main am: 3ac6614666temp_319669529
Original change: https://android-review.googlesource.com/c/platform/build/+/2990390
Change-Id: Icb3c8a629adb2b19e700af8c1a92cb1892ba2ca4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/tasks/framework_library.mk | 51 | ||||
| -rw-r--r-- | core/tasks/meta-lic.mk | 9 |
2 files changed, 0 insertions, 60 deletions
diff --git a/core/tasks/framework_library.mk b/core/tasks/framework_library.mk deleted file mode 100644 index 0bf485445c..0000000000 --- a/core/tasks/framework_library.mk +++ /dev/null @@ -1,51 +0,0 @@ -# -# 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 dea4892211..0079714ac3 100644 --- a/core/tasks/meta-lic.mk +++ b/core/tasks/meta-lic.mk @@ -21,12 +21,3 @@ $(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,)) |