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

Commit 2b27ed00 authored by Nelson Li's avatar Nelson Li
Browse files

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: Ieef40808a0bbaa63a73491ddde0949ae1780e615
parent 85acebd1

core/Makefile

+18 −0
Original line number Diff line number Diff line
@@ -7565,6 +7565,24 @@ else 
sdk_atree_files += $(atree_dir)/sdk.atree

endif



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)



deps := \

	$(OUT_DOCS)/offline-sdk-timestamp \

	$(SDK_METADATA_FILES) \

core/tasks/meta-lic.mk

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

core/tasks/offline-sdk-docs.mk

0 → 100644
+26 −0
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.

#



# 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