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

Commit 5381c1a3 authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

merge from open-source master 

Change-Id: I7254b628bba1be9222a643e9e8c73e1240f645d7
parents b87e0e1d 048683ea

core/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -907,6 +907,7 @@ target-files-package: $(BUILT_TARGET_FILES_PACKAGE) 
ifneq ($(TARGET_SIMULATOR),true)

ifneq ($(TARGET_PRODUCT),sdk)

ifneq ($(TARGET_PRODUCT),generic)

ifneq ($(TARGET_PRODUCT),aosp_emulator_us)



name := $(TARGET_PRODUCT)

ifeq ($(TARGET_BUILD_TYPE),debug)
@@ -936,6 +937,7 @@ $(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) otatools 
.PHONY: otapackage

otapackage: $(INTERNAL_OTA_PACKAGE_TARGET)



endif    # TARGET_PRODUCT != aosp_emulator_us

endif    # TARGET_PRODUCT != generic

endif    # TARGET_PRODUCT != sdk

endif    # TARGET_SIMULATOR != true

core/config.mk

+1 −0
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ include $(BUILD_SYSTEM)/envsetup.mk 
board_config_mk := \

	$(strip $(wildcard \

		$(SRC_TARGET_DIR)/board/$(TARGET_DEVICE)/BoardConfig.mk \

		device/*/$(TARGET_DEVICE)/BoardConfig.mk \

		vendor/*/$(TARGET_DEVICE)/BoardConfig.mk \

	))

ifeq ($(board_config_mk),)

core/product.mk

+2 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
# $(call ) isn't necessary.

#

define _find-android-products-files

$(shell test -d device && find device -maxdepth 6 -name AndroidProducts.mk) \

  $(shell test -d vendor && find vendor -maxdepth 6 -name AndroidProducts.mk) \

  $(SRC_TARGET_DIR)/product/AndroidProducts.mk

endef

target/product/generic.mk

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ PRODUCT_PACKAGES := \ 
    LatinIME \

    Mms \

    Music \

    Provision \

    Settings \

    Sync \

    Updater \