diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2018-06-05 07:22:42 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-06-05 07:28:41 +0000 |
commit | 4a6602816b407e4d23c30a36c2992785c4801f67 (patch) | |
tree | b4a7b79c236d3002c7a29c09afdce69be28306aa | |
parent | 350b884b63dfddaa0b964ae0c31e2ee0edeab0fc (diff) | |
parent | c5e25e9b84ac24a5f6467c9c830fee0b50df0e61 (diff) | |
download | build-4a6602816b407e4d23c30a36c2992785c4801f67.tar.gz |
Make change and version bump to PPR1.180605.001
Change-Id: I0f05c0be086153813657277b5cb39f26d570468e
-rw-r--r-- | core/build_id.mk | 2 | ||||
-rw-r--r-- | core/version_defaults.mk | 2 | ||||
-rw-r--r-- | target/board/generic/device.mk | 5 | ||||
-rw-r--r-- | target/board/generic/sepolicy/goldfish_setup.te | 3 | ||||
-rw-r--r-- | target/board/generic/sepolicy/property.te | 1 | ||||
-rw-r--r-- | target/board/generic/sepolicy/property_contexts | 2 | ||||
-rw-r--r-- | target/board/generic_arm64/device.mk | 5 | ||||
-rw-r--r-- | target/board/generic_x86/device.mk | 5 | ||||
-rwxr-xr-x | target/board/generic_x86_64/device.mk | 5 | ||||
-rw-r--r-- | target/product/aosp_arm.mk | 2 | ||||
-rw-r--r-- | target/product/aosp_arm64.mk | 2 | ||||
-rw-r--r-- | target/product/aosp_x86.mk | 2 | ||||
-rw-r--r-- | target/product/aosp_x86_64.mk | 2 | ||||
-rw-r--r-- | target/product/emulator.mk | 15 | ||||
-rw-r--r-- | target/product/sdk_phone_x86.mk | 20 | ||||
-rw-r--r-- | target/product/sdk_phone_x86_64.mk | 22 |
16 files changed, 28 insertions, 67 deletions
diff --git a/core/build_id.mk b/core/build_id.mk index ed9617bd21..dedfc2af09 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=PPR1.180604.001 +export BUILD_ID=PPR1.180605.001 diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 43f3f024e5..6c5eac22fc 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -231,7 +231,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-06-05 + PLATFORM_SECURITY_PATCH := 2018-07-05 endif ifndef PLATFORM_SECURITY_PATCH_TIMESTAMP diff --git a/target/board/generic/device.mk b/target/board/generic/device.mk index d2f6310902..82c6657f58 100644 --- a/target/board/generic/device.mk +++ b/target/board/generic/device.mk @@ -17,12 +17,7 @@ # This is a build configuration for the product aspects that # are specific to the emulator. -PRODUCT_PROPERTY_OVERRIDES := \ - ro.ril.hsxpa=1 \ - ro.ril.gprsclass=10 - PRODUCT_COPY_FILES := \ - device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \ 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 \ diff --git a/target/board/generic/sepolicy/goldfish_setup.te b/target/board/generic/sepolicy/goldfish_setup.te index a99653ca7f..3041436b31 100644 --- a/target/board/generic/sepolicy/goldfish_setup.te +++ b/target/board/generic/sepolicy/goldfish_setup.te @@ -25,10 +25,11 @@ allow goldfish_setup varrun_file:file { mounton getattr create read write open u allow goldfish_setup execns_exec:file rx_file_perms; allow goldfish_setup proc_net:file rw_file_perms; allow goldfish_setup proc:file r_file_perms; -set_prop(goldfish_setup, ctl_default_prop); allow goldfish_setup nsfs:file r_file_perms; allow goldfish_setup system_data_file:dir getattr; allow goldfish_setup kernel:system module_request; +set_prop(goldfish_setup, qemu_prop); +get_prop(goldfish_setup, net_share_prop); # Allow goldfish_setup to run /system/bin/ip and /system/bin/iw allow goldfish_setup system_file:file execute_no_trans; # Allow goldfish_setup to run init.wifi.sh diff --git a/target/board/generic/sepolicy/property.te b/target/board/generic/sepolicy/property.te index 8c7c892d70..3593a39ddc 100644 --- a/target/board/generic/sepolicy/property.te +++ b/target/board/generic/sepolicy/property.te @@ -2,3 +2,4 @@ type qemu_prop, property_type; type qemu_cmdline, property_type; type radio_noril_prop, property_type; type net_eth0_prop, property_type; +type net_share_prop, property_type; diff --git a/target/board/generic/sepolicy/property_contexts b/target/board/generic/sepolicy/property_contexts index c5a2bc1798..f7a241cfbc 100644 --- a/target/board/generic/sepolicy/property_contexts +++ b/target/board/generic/sepolicy/property_contexts @@ -1,6 +1,8 @@ qemu. u:object_r:qemu_prop:s0 qemu.cmdline u:object_r:qemu_cmdline:s0 +vendor.qemu u:object_r:qemu_prop:s0 ro.emu. u:object_r:qemu_prop:s0 ro.emulator. u:object_r:qemu_prop:s0 ro.radio.noril u:object_r:radio_noril_prop:s0 net.eth0. u:object_r:net_eth0_prop:s0 +net.shared_net_ip u:object_r:net_share_prop:s0 diff --git a/target/board/generic_arm64/device.mk b/target/board/generic_arm64/device.mk index 8d62f4bff8..c0fbdcda4b 100644 --- a/target/board/generic_arm64/device.mk +++ b/target/board/generic_arm64/device.mk @@ -17,12 +17,7 @@ # This is a build configuration for the product aspects that # are specific to the emulator. -PRODUCT_PROPERTY_OVERRIDES := \ - ro.ril.hsxpa=1 \ - ro.ril.gprsclass=10 - PRODUCT_COPY_FILES := \ - device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \ 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 \ diff --git a/target/board/generic_x86/device.mk b/target/board/generic_x86/device.mk index 7b6fa3ce8e..ecf8697354 100644 --- a/target/board/generic_x86/device.mk +++ b/target/board/generic_x86/device.mk @@ -17,12 +17,7 @@ # This is a build configuration for the product aspects that # are specific to the emulator. -PRODUCT_PROPERTY_OVERRIDES := \ - ro.ril.hsxpa=1 \ - ro.ril.gprsclass=10 - PRODUCT_COPY_FILES := \ - device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \ 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 \ diff --git a/target/board/generic_x86_64/device.mk b/target/board/generic_x86_64/device.mk index 7b6fa3ce8e..ecf8697354 100755 --- a/target/board/generic_x86_64/device.mk +++ b/target/board/generic_x86_64/device.mk @@ -17,12 +17,7 @@ # This is a build configuration for the product aspects that # are specific to the emulator. -PRODUCT_PROPERTY_OVERRIDES := \ - ro.ril.hsxpa=1 \ - ro.ril.gprsclass=10 - PRODUCT_COPY_FILES := \ - device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \ 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 \ diff --git a/target/product/aosp_arm.mk b/target/product/aosp_arm.mk index b59f3cc234..bda9a4212d 100644 --- a/target/product/aosp_arm.mk +++ b/target/product/aosp_arm.mk @@ -15,7 +15,7 @@ # PRODUCT_PROPERTY_OVERRIDES += \ - rild.libpath=/vendor/lib/libreference-ril.so + vendor.rild.libpath=/vendor/lib/libreference-ril.so # Note: the following lines need to stay at the beginning so that it can # take priority and override the rules it inherit from other mk files diff --git a/target/product/aosp_arm64.mk b/target/product/aosp_arm64.mk index 129f213fa7..727762a5ed 100644 --- a/target/product/aosp_arm64.mk +++ b/target/product/aosp_arm64.mk @@ -15,7 +15,7 @@ # PRODUCT_PROPERTY_OVERRIDES += \ - rild.libpath=/vendor/lib64/libreference-ril.so + vendor.rild.libpath=/vendor/lib64/libreference-ril.so # This is a build configuration for a full-featured build of the # Open-Source part of the tree. It's geared toward a US-centric diff --git a/target/product/aosp_x86.mk b/target/product/aosp_x86.mk index 315a099ed1..cd099e75e3 100644 --- a/target/product/aosp_x86.mk +++ b/target/product/aosp_x86.mk @@ -15,7 +15,7 @@ # PRODUCT_PROPERTY_OVERRIDES += \ - rild.libpath=/vendor/lib/libreference-ril.so + vendor.rild.libpath=/vendor/lib/libreference-ril.so # This is a build configuration for a full-featured build of the # Open-Source part of the tree. It's geared toward a US-centric diff --git a/target/product/aosp_x86_64.mk b/target/product/aosp_x86_64.mk index 84d38632fc..368600920f 100644 --- a/target/product/aosp_x86_64.mk +++ b/target/product/aosp_x86_64.mk @@ -15,7 +15,7 @@ # PRODUCT_PROPERTY_OVERRIDES += \ - rild.libpath=/vendor/lib64/libreference-ril.so + vendor.rild.libpath=/vendor/lib64/libreference-ril.so # This is a build configuration for a full-featured build of the # Open-Source part of the tree. It's geared toward a US-centric diff --git a/target/product/emulator.mk b/target/product/emulator.mk index 03c7d3067d..78d8e921ab 100644 --- a/target/product/emulator.mk +++ b/target/product/emulator.mk @@ -79,6 +79,7 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ android.hardware.audio@2.0-impl \ android.hardware.audio.effect@2.0-impl \ + android.hardware.broadcastradio@1.1-service \ android.hardware.broadcastradio@1.0-impl \ android.hardware.soundtrigger@2.0-impl @@ -133,6 +134,7 @@ PRODUCT_PACKAGES += \ wpa_supplicant \ PRODUCT_COPY_FILES += \ + device/generic/goldfish/data/etc/apns-conf.xml:data/misc/apns/apns-conf.xml \ device/generic/goldfish/init.ranchu-core.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.ranchu-core.sh \ device/generic/goldfish/init.ranchu-net.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.ranchu-net.sh \ device/generic/goldfish/wifi/init.wifi.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.wifi.sh \ @@ -175,3 +177,16 @@ PRODUCT_FULL_TREBLE_OVERRIDE := true #once it is fixed in aosp, remove this block of comment. #PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ #config.disable_location=true + +# Enable Perfetto traced +PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ + persist.traced.enable=1 + +# enable Google-specific location features, +# like NetworkLocationProvider and LocationCollector +PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ + ro.com.google.locationfeatures=1 + +# disable setupwizard +PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ + ro.setupwizard.mode=DISABLED diff --git a/target/product/sdk_phone_x86.mk b/target/product/sdk_phone_x86.mk index 9bbf9b43ff..6423625b4e 100644 --- a/target/product/sdk_phone_x86.mk +++ b/target/product/sdk_phone_x86.mk @@ -14,25 +14,7 @@ # limitations under the License. # -PRODUCT_PROPERTY_OVERRIDES += \ - rild.libpath=/vendor/lib/libreference-ril.so - -# This is a build configuration for a full-featured build of the -# Open-Source part of the tree. It's geared toward a US-centric -# build quite specifically for the emulator, and might not be -# entirely appropriate to inherit from for on-device configurations. -PRODUCT_COPY_FILES += \ - development/sys-img/advancedFeatures.ini:advancedFeatures.ini \ - device/generic/goldfish/data/etc/encryptionkey.img:encryptionkey.img \ - prebuilts/qemu-kernel/x86_64/4.9/kernel-qemu2:kernel-ranchu-64 - -$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_base.mk) - -# AOSP emulator images build the AOSP messaging app. -# Google API images override with the Google API app. -# See vendor/google/products/sdk_google_phone_*.mk -PRODUCT_PACKAGES += \ - messaging +$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_x86.mk) # Overrides PRODUCT_BRAND := Android diff --git a/target/product/sdk_phone_x86_64.mk b/target/product/sdk_phone_x86_64.mk index 25b0d0386d..bffbc7bf91 100644 --- a/target/product/sdk_phone_x86_64.mk +++ b/target/product/sdk_phone_x86_64.mk @@ -14,27 +14,7 @@ # limitations under the License. # -PRODUCT_PROPERTY_OVERRIDES += \ - rild.libpath=/vendor/lib64/libreference-ril.so - -# This is a build configuration for a full-featured build of the -# Open-Source part of the tree. It's geared toward a US-centric -# build quite specifically for the emulator, and might not be -# entirely appropriate to inherit from for on-device configurations. - -PRODUCT_COPY_FILES += \ - development/sys-img/advancedFeatures.ini:advancedFeatures.ini \ - device/generic/goldfish/data/etc/encryptionkey.img:encryptionkey.img \ - prebuilts/qemu-kernel/x86_64/4.9/kernel-qemu2:kernel-ranchu - -$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_base.mk) - -# AOSP emulator images build the AOSP messaging app. -# Google API images override with the Google API app. -# See vendor/google/products/sdk_google_phone_*.mk -PRODUCT_PACKAGES += \ - messaging +$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_x86_64.mk) # Overrides PRODUCT_BRAND := Android |