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

Commit 1e061d78 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Remove ALL_PREBUILT, all users have been removed" 

am: cfb55456

* commit 'cfb55456':
  Remove ALL_PREBUILT, all users have been removed
parents 9d13d6a7 cfb55456

core/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -482,7 +482,6 @@ endif 
# -----------------------------------------------------------------

# the ramdisk

INTERNAL_RAMDISK_FILES := $(filter $(TARGET_ROOT_OUT)/%, \

	$(ALL_PREBUILT) \

	$(ALL_GENERATED_SOURCES) \

	$(ALL_DEFAULT_INSTALLED_MODULES))
@@ -1099,7 +1098,6 @@ PDK_FUSION_SYSIMG_FILES := \ 
        $(ALL_PDK_FUSION_FILES))



INTERNAL_SYSTEMIMAGE_FILES := $(filter $(TARGET_OUT)/%, \

    $(ALL_PREBUILT) \

    $(ALL_GENERATED_SOURCES) \

    $(ALL_DEFAULT_INSTALLED_MODULES) \

    $(PDK_FUSION_SYSIMG_FILES) \
@@ -2074,7 +2072,6 @@ ATREE_FILES := 
# if we don't have a real list, then use "everything"

ifeq ($(strip $(ATREE_FILES)),)

ATREE_FILES := \

	$(ALL_PREBUILT) \

	$(ALL_DEFAULT_INSTALLED_MODULES) \

	$(INSTALLED_RAMDISK_TARGET) \

	$(ALL_DOCS) \

core/definitions.mk

+0 −4
Original line number Diff line number Diff line
@@ -55,10 +55,6 @@ ALL_MODULE_TAGS:= 
# its sub-variables.)

ALL_MODULE_NAME_TAGS:=



# Full paths to all prebuilt files that will be copied

# (used to make the dependency on acp)

ALL_PREBUILT:=



# Full path to all files that are made by some tool

ALL_GENERATED_SOURCES:=

core/legacy_prebuilts.mk

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

# Copyright (C) 2010 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.

#



# This is the list of modules grandfathered to use ALL_PREBUILT



# DO NOT ADD ANY NEW MODULE TO THIS FILE

#

# ALL_PREBUILT modules are hard to control and audit and we don't want

# to add any new such module in the system



GRANDFATHERED_ALL_PREBUILT := \

	bmgr \

	ime \

	input \

	monkey \

	pm \

	RFFspeed_501.bmd \

	RFFstd_501.bmd \

	svc

core/main.mk

+3 −23
Original line number Diff line number Diff line
@@ -554,22 +554,6 @@ ifeq ($(stash_product_vars),true) 
  $(call assert-product-vars, __STASHED)

endif



include $(BUILD_SYSTEM)/legacy_prebuilts.mk

ifneq ($(filter-out $(GRANDFATHERED_ALL_PREBUILT),$(strip $(notdir $(ALL_PREBUILT)))),)

  $(warning *** Some files have been added to ALL_PREBUILT.)

  $(warning *)

  $(warning * ALL_PREBUILT is a deprecated mechanism that)

  $(warning * should not be used for new files.)

  $(warning * As an alternative, use PRODUCT_COPY_FILES in)

  $(warning * the appropriate product definition.)

  $(warning * build/target/product/core.mk is the product)

  $(warning * definition used in all products.)

  $(warning *)

  $(foreach bad_prebuilt,$(filter-out $(GRANDFATHERED_ALL_PREBUILT),$(strip $(notdir $(ALL_PREBUILT)))),$(warning * unexpected $(bad_prebuilt) in ALL_PREBUILT))

  $(warning *)

  $(error ALL_PREBUILT contains unexpected files)

endif



# -------------------------------------------------------------------

# All module makefiles have been included at this point.

# -------------------------------------------------------------------
@@ -860,9 +844,6 @@ modules_to_check := $(sort $(modules_to_check)) 
# This is used to to get the ordering right, you can also use these,

# but they're considered undocumented, so don't complain if their

# behavior changes.

.PHONY: prebuilt

prebuilt: $(ALL_PREBUILT)



# An internal target that depends on all copied headers

# (see copy_headers.make).  Other targets that need the

# headers to be copied first can depend on this target.
@@ -873,8 +854,7 @@ $(ALL_C_CPP_ETC_OBJECTS): | all_copied_headers 


# All the droid stuff, in directories

.PHONY: files

files: prebuilt \

        $(modules_to_install) \

files: $(modules_to_install) \

       $(INSTALLED_ANDROID_INFO_TXT_TARGET)



# -------------------------------------------------------------------
@@ -1078,7 +1058,7 @@ sample_APKS_COLLECTION := \ 
$(foreach module,$(sample_MODULES),$(eval $(call \

        copy-one-file,$(module),$(sample_APKS_DEST_PATH)/$(notdir $(module)))))

sample_ADDITIONAL_INSTALLED := \

        $(filter-out $(modules_to_install) $(modules_to_check) $(ALL_PREBUILT),$(sample_MODULES))

        $(filter-out $(modules_to_install) $(modules_to_check),$(sample_MODULES))

samplecode: $(sample_APKS_COLLECTION)

	@echo "Collect sample code apks: $^"

	# remove apks that are not intended to be installed.