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

Commit 4a459aee authored by Bill Yi's avatar Bill Yi
Browse files

Merge commit '75bbddec' into HEAD

parents d131a5a8 75bbddec

core/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -214,6 +214,7 @@ endif 
			DATE="$(DATE_FROM_FILE)" \

			BUILD_NUMBER="$(BUILD_NUMBER_FROM_FILE)" \

			BOARD_BUILD_SYSTEM_ROOT_IMAGE="$(BOARD_BUILD_SYSTEM_ROOT_IMAGE)" \

			AB_OTA_UPDATER="$(AB_OTA_UPDATER)" \

			PLATFORM_VERSION="$(PLATFORM_VERSION)" \

			PLATFORM_SECURITY_PATCH="$(PLATFORM_SECURITY_PATCH)" \

			PLATFORM_BASE_OS="$(PLATFORM_BASE_OS)" \

core/product_config.mk

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ ifdef product_goals 
  # which really means TARGET_PRODUCT=dream make installclean.

  ifneq ($(filter-out $(INTERNAL_VALID_VARIANTS),$(TARGET_BUILD_VARIANT)),)

    MAKECMDGOALS := $(MAKECMDGOALS) $(TARGET_BUILD_VARIANT)

    TARGET_BUILD_VARIANT := eng

    TARGET_BUILD_VARIANT := userdebug

    default_goal_substitution :=

  else

    default_goal_substitution := $(DEFAULT_GOAL)

core/version_defaults.mk

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)" 
  # Can be an arbitrary string, but must be a single word.

  #

  # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.

  PLATFORM_SECURITY_PATCH := 2015-12-01

  PLATFORM_SECURITY_PATCH := 2016-03-01

endif



ifeq "" "$(PLATFORM_BASE_OS)"

target/product/core.mk

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ PRODUCT_PACKAGES += \ 
    DownloadProviderUi \

    Email \

    ExactCalculator \

    Exchange2 \

    ExternalStorageProvider \

    FusedLocation \

    InputDevices \

target/product/sdk_phone_arm64.mk

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_base.mk) 
$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_arm64/device.mk)



# Overrides

PRODUCT_BRAND := generic_arm64

PRODUCT_BRAND := Android

PRODUCT_NAME := sdk_phone_arm64

PRODUCT_DEVICE := generic_arm64

PRODUCT_MODEL := Android SDK built for arm64