Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a65d662 authored by Clinton Ke's avatar Clinton Ke Committed by Automerger Merge Worker
Browse files

Merge "Revert "Move frameworks/base/Android.mk to build/tasks"" into main am: 3ac66146 

Original change: https://android-review.googlesource.com/c/platform/build/+/2990390



Change-Id: Icb3c8a629adb2b19e700af8c1a92cb1892ba2ca4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2aba12de 3ac66146

core/tasks/framework_library.mk

deleted100644 → 0
+0 −51
Original line number Diff line number Diff line 
#

# 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

core/tasks/meta-lic.mk

+0 −9
Original line number Diff line number Diff line
@@ -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,))