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

Commit 9148f7ee authored by Nelson Li's avatar Nelson Li
Browse files

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.
6. `(call first-makefiles-under)` can be removed after all Android.mk
   files in the subdirectories are converted to Android.bp.

Bug: 322732227
Test: m docs offline-sdk-docs framework-doc-stubs
Change-Id: Ied32cdb49af47f7e2892dc8081dbb8aa82c18cd4
parent 5b3ef0fd

Android.mk

+2 −63
Original line number Original line Diff line number Diff line
@@ -15,67 +15,6 @@ 
#

#

LOCAL_PATH := $(call my-dir)

LOCAL_PATH := $(call my-dir)





$(eval $(call declare-1p-copy-files,frameworks/base,.ogg))

# TODO: Removed it after all Android.mk files in the subdirectories are

$(eval $(call declare-1p-copy-files,frameworks/base,.kl))

#       converted to Android.bp.

$(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))
 
include $(call first-makefiles-under,$(LOCAL_PATH))
 
endif



endif # ANDROID_BUILD_EMBEDDED