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

Commit 7865f412 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master" into stage-dr1-aosp-master

parents 48cc7446 0d7eeda2

core/tasks/sdk-addon.mk

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ files_to_copy += \ 
	$(addon_dir_img):$(INSTALLED_QEMU_VENDORIMAGE):images/$(TARGET_CPU_ABI)/vendor.img \

	$(addon_dir_img):$(BUILT_RAMDISK_TARGET):images/$(TARGET_CPU_ABI)/ramdisk.img \

	$(addon_dir_img):$(PRODUCT_OUT)/system/build.prop:images/$(TARGET_CPU_ABI)/build.prop \

	$(addon_dir_img):device/generic/goldfish/data/etc/userdata.img:images/$(TARGET_CPU_ABI)/userdata.img \

	$(addon_dir_img):$(target_notice_file_txt):images/$(TARGET_CPU_ABI)/NOTICE.txt \

	$(addon_dir_img):$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SDK_ADDON_SYS_IMG_SOURCE_PROP):images/source.properties

core/version_defaults.mk

+1 −1
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ ifndef PLATFORM_SECURITY_PATCH 
    #  It must be of the form "YYYY-MM-DD" on production devices.

    #  It must match one of the Android Security Patch Level strings of the Public Security Bulletins.

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

      PLATFORM_SECURITY_PATCH := 2018-08-05

      PLATFORM_SECURITY_PATCH := 2018-09-05

endif

.KATI_READONLY := PLATFORM_SECURITY_PATCH

target/board/generic/device.mk

+0 −11
Original line number Diff line number Diff line
@@ -14,17 +14,6 @@ 
# limitations under the License.

#



# This is a build configuration for the product aspects that

# are specific to the emulator.



PRODUCT_COPY_FILES := \

    device/generic/goldfish/camera/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles.xml \

    frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml \

    frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_telephony.xml \

    frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video.xml \

    device/generic/goldfish/camera/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \

    hardware/libhardware_legacy/audio/audio_policy.conf:system/etc/audio_policy.conf



# minimal configuration for audio policy.

PRODUCT_COPY_FILES += \

    frameworks/av/services/audiopolicy/config/audio_policy_configuration_generic.xml:system/etc/audio_policy_configuration.xml \

target/board/generic_arm64/BoardConfig.mk

+1 −2
Original line number Diff line number Diff line
@@ -56,8 +56,7 @@ include build/make/target/board/BoardConfigEmuCommon.mk 
include build/make/target/board/BoardConfigGsiCommon.mk



TARGET_USERIMAGES_USE_EXT4 := true

# Partition size is default 1.5GB (1536MB) for 64 bits projects

BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1610612736

BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2684354560 # 2.5 GB

BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800



# Emulator system image is going to be used as GSI and some vendor still hasn't

target/board/generic_arm64/device.mk

+0 −10
Original line number Diff line number Diff line
@@ -14,16 +14,6 @@ 
# limitations under the License.

#



# This is a build configuration for the product aspects that

# are specific to the emulator.



PRODUCT_COPY_FILES := \

    device/generic/goldfish/camera/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles.xml \

    frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml \

    frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_telephony.xml \

    frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video.xml \

    device/generic/goldfish/camera/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml



# minimal configuration for audio policy.

PRODUCT_COPY_FILES += \

    frameworks/av/services/audiopolicy/config/audio_policy_configuration_generic.xml:system/etc/audio_policy_configuration.xml \