diff options
| -rw-r--r-- | core/tasks/sdk-addon.mk | 1 | ||||
| -rw-r--r-- | core/version_defaults.mk | 2 | ||||
| -rw-r--r-- | target/board/generic/device.mk | 11 | ||||
| -rw-r--r-- | target/board/generic_arm64/device.mk | 10 | ||||
| -rw-r--r-- | target/board/generic_x86/device.mk | 14 | ||||
| -rwxr-xr-x | target/board/generic_x86_64/device.mk | 14 |
6 files changed, 2 insertions, 50 deletions
diff --git a/core/tasks/sdk-addon.mk b/core/tasks/sdk-addon.mk index 8baac5af36..93fea4ebc9 100644 --- a/core/tasks/sdk-addon.mk +++ b/core/tasks/sdk-addon.mk @@ -70,6 +70,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 diff --git a/core/version_defaults.mk b/core/version_defaults.mk index e3cf13dd03..42a3beab6e 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -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 diff --git a/target/board/generic/device.mk b/target/board/generic/device.mk index a75bd07adc..0a3241511a 100644 --- a/target/board/generic/device.mk +++ b/target/board/generic/device.mk @@ -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 - # NFC: # Provide default libnfc-nci.conf file for devices that does not have one in # vendor/etc because aosp system image (of aosp_$arch products) is going to diff --git a/target/board/generic_arm64/device.mk b/target/board/generic_arm64/device.mk index 8bd6a8bc54..2004624ca3 100644 --- a/target/board/generic_arm64/device.mk +++ b/target/board/generic_arm64/device.mk @@ -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 - # NFC: # Provide default libnfc-nci.conf file for devices that does not have one in # vendor/etc because aosp system image (of aosp_$arch products) is going to diff --git a/target/board/generic_x86/device.mk b/target/board/generic_x86/device.mk index fa2d4729ae..0a3241511a 100644 --- a/target/board/generic_x86/device.mk +++ b/target/board/generic_x86/device.mk @@ -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:system/etc/media_profiles.xml \ - frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \ - frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:system/etc/media_codecs_google_telephony.xml \ - frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \ - device/generic/goldfish/camera/media_codecs.xml:system/etc/media_codecs.xml - # NFC: # Provide default libnfc-nci.conf file for devices that does not have one in # vendor/etc because aosp system image (of aosp_$arch products) is going to @@ -32,7 +22,3 @@ PRODUCT_COPY_FILES := \ # NFC configuration file should be in vendor/etc, instead of system/etc PRODUCT_COPY_FILES += \ device/generic/common/nfc/libnfc-nci.conf:system/etc/libnfc-nci.conf - -PRODUCT_PACKAGES := \ - audio.primary.goldfish \ - vibrator.goldfish diff --git a/target/board/generic_x86_64/device.mk b/target/board/generic_x86_64/device.mk index fa2d4729ae..0a3241511a 100755 --- a/target/board/generic_x86_64/device.mk +++ b/target/board/generic_x86_64/device.mk @@ -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:system/etc/media_profiles.xml \ - frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \ - frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:system/etc/media_codecs_google_telephony.xml \ - frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \ - device/generic/goldfish/camera/media_codecs.xml:system/etc/media_codecs.xml - # NFC: # Provide default libnfc-nci.conf file for devices that does not have one in # vendor/etc because aosp system image (of aosp_$arch products) is going to @@ -32,7 +22,3 @@ PRODUCT_COPY_FILES := \ # NFC configuration file should be in vendor/etc, instead of system/etc PRODUCT_COPY_FILES += \ device/generic/common/nfc/libnfc-nci.conf:system/etc/libnfc-nci.conf - -PRODUCT_PACKAGES := \ - audio.primary.goldfish \ - vibrator.goldfish |