Revert "dragon: update vsync phase numbers" am: 9a79c17aa3 am: 8e1d4942d3
am: b5aad13401
Change-Id: I0db6e7652c60c2a624f9c43106c90336efcf62a4
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 7bc7d5b..5faaef4 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -15,4 +15,5 @@
#
PRODUCT_MAKEFILES := \
- $(LOCAL_DIR)/aosp_dragon.mk
+ $(LOCAL_DIR)/aosp_dragon.mk \
+ $(LOCAL_DIR)/aosp_dragon_car.mk
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 8933ebc..c9e5cf0 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -49,3 +49,5 @@
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/permissions/android.hardware.location.gps.xml)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/permissions/android.hardware.camera.full.xml)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/permissions/android.hardware.camera.manual_sensor.xml)
+$(call add-clean-step, rm -f $(PRODUCT_OUT)/system/lib/hw/android.hardware.broadcastradio@1.0-impl.so)
+$(call add-clean-step, rm -f $(PRODUCT_OUT)/system/lib64/hw/android.hardware.broadcastradio@1.0-impl.so)
diff --git a/aosp_dragon_car.mk b/aosp_dragon_car.mk
new file mode 100644
index 0000000..34aa6c7
--- /dev/null
+++ b/aosp_dragon_car.mk
@@ -0,0 +1,37 @@
+# Copyright (C) 2017 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# This file is the build configuration for an aosp Android
+# build for dragon hardware. This cleanly combines a set of
+# device-specific aspects (drivers) with a device-agnostic
+# product configuration (apps). Except for a few implementation
+# details, it only fundamentally contains two inherit-product
+# lines, aosp and dragon, hence its name.
+#
+
+PRODUCT_COPY_FILES += \
+ device/google/dragon/manifest_dragon_car.xml:vendor/manifest.xml
+
+$(call inherit-product, packages/services/Car/car_product/build/car.mk)
+$(call inherit-product, device/google/dragon/aosp_dragon.mk)
+
+BOARD_SEPOLICY_DIRS += packages/services/Car/car_product/sepolicy
+
+PRODUCT_NAME := aosp_dragon_car
+PRODUCT_DEVICE := dragon
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := Android Auto Embedded on dragon
+PRODUCT_MANUFACTURER := Google
+PRODUCT_RESTRICT_VENDOR_FILES := true
diff --git a/device.mk b/device.mk
index 917e755..62a7c9e 100644
--- a/device.mk
+++ b/device.mk
@@ -232,7 +232,6 @@
PRODUCT_PACKAGES += \
android.hardware.audio@2.0-impl \
android.hardware.audio.effect@2.0-impl \
- android.hardware.broadcastradio@1.0-impl \
android.hardware.soundtrigger@2.0-impl
PRODUCT_PACKAGES += \
diff --git a/manifest_dragon_car.xml b/manifest_dragon_car.xml
new file mode 100644
index 0000000..4d4167f
--- /dev/null
+++ b/manifest_dragon_car.xml
@@ -0,0 +1,39 @@
+<manifest version="1.0" type="device">
+ <hal format="hidl">
+ <name>android.hardware.graphics.allocator</name>
+ <transport>hwbinder</transport>
+ <impl level="generic"></impl>
+ <version>2.0</version>
+ <interface>
+ <name>IAllocator</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+ <hal format="hidl">
+ <name>android.hardware.wifi</name>
+ <transport>hwbinder</transport>
+ <version>1.0</version>
+ <interface>
+ <name>IWifi</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+ <hal format="hidl">
+ <name>android.hardware.wifi.supplicant</name>
+ <transport>hwbinder</transport>
+ <version>1.0</version>
+ <interface>
+ <name>ISupplicant</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+ <hal format="hidl">
+ <name>android.hardware.automotive.vehicle</name>
+ <transport>hwbinder</transport>
+ <version>2.1</version>
+ <interface>
+ <name>IVehicle</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+</manifest>
diff --git a/media_codecs_performance.xml b/media_codecs_performance.xml
index e1f9330..376230e 100644
--- a/media_codecs_performance.xml
+++ b/media_codecs_performance.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2016 The Android Open Source Project
+<!-- Copyright 2017 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -14,111 +14,112 @@
limitations under the License.
-->
+<!-- Generated file for ryu using measurements between OPR1.170309.003 and OPM1.170731.001 -->
<MediaCodecs>
<Encoders>
<MediaCodec name="OMX.Nvidia.h264.encoder" type="video/avc" update="true">
- <Limit name="measured-frame-rate-320x240" range="280-289" /> <!-- N=38 v93%=1.1 -->
- <!-- measured 93%:152-276 med:168 SLOW -->
- <Limit name="measured-frame-rate-720x480" range="168-205" /> <!-- N=38 v93%=1.3 -->
- <!-- measured 93%:83-139 med:90 SLOW -->
- <Limit name="measured-frame-rate-1280x720" range="89-108" /> <!-- N=38 v93%=1.3 -->
- <Limit name="measured-frame-rate-1920x1080" range="88-88" /> <!-- N=38 v93%=1.4 -->
+ <Limit name="measured-frame-rate-320x240" range="334-334" /> <!-- N=114 v98%=1.2 -->
+ <Limit name="measured-frame-rate-720x480" range="200-209" /> <!-- N=114 v98%=1.3 -->
+ <Limit name="measured-frame-rate-1280x720" range="122-122" /> <!-- N=114 v98%=1.2 -->
+ <Limit name="measured-frame-rate-1920x1080" range="84-94" /> <!-- N=114 v98%=1.4 -->
</MediaCodec>
<MediaCodec name="OMX.Nvidia.vp8.encoder" type="video/x-vnd.on2.vp8" update="true">
- <Limit name="measured-frame-rate-320x180" range="265-273" /> <!-- N=38 v93%=1.1 -->
- <Limit name="measured-frame-rate-640x360" range="196-215" /> <!-- N=38 v93%=1.2 -->
- <Limit name="measured-frame-rate-1280x720" range="104-114" /> <!-- N=38 v93%=1.2 -->
- <Limit name="measured-frame-rate-1920x1080" range="67-67" /> <!-- N=38 v93%=1.1 -->
+ <Limit name="measured-frame-rate-320x180" range="306-306" /> <!-- N=114 v98%=1.1 -->
+ <Limit name="measured-frame-rate-640x360" range="218-218" /> <!-- N=114 v98%=1.2 -->
+ <Limit name="measured-frame-rate-1280x720" range="123-123" /> <!-- N=114 v98%=1.2 -->
+ <Limit name="measured-frame-rate-1920x1080" range="68-68" /> <!-- N=114 v98%=1.1 -->
</MediaCodec>
<MediaCodec name="OMX.google.h263.encoder" type="video/3gpp" update="true">
- <Limit name="measured-frame-rate-176x144" range="646-653" /> <!-- N=38 v93%=1.1 -->
+ <Limit name="measured-frame-rate-176x144" range="676-676" /> <!-- N=114 v98%=1.1 -->
</MediaCodec>
<MediaCodec name="OMX.google.h264.encoder" type="video/avc" update="true">
- <Limit name="measured-frame-rate-320x240" range="481-481" /> <!-- N=38 v93%=1.2 -->
- <Limit name="measured-frame-rate-720x480" range="138-138" /> <!-- N=38 v93%=1.2 -->
- <Limit name="measured-frame-rate-1280x720" range="72-75" /> <!-- N=38 v93%=1.1 -->
- <Limit name="measured-frame-rate-1920x1080" range="36-36" /> <!-- N=38 v93%=1.1 -->
+ <Limit name="measured-frame-rate-320x240" range="537-537" /> <!-- N=114 v98%=1.1 -->
+ <Limit name="measured-frame-rate-720x480" range="153-153" /> <!-- N=114 v98%=1.1 -->
+ <Limit name="measured-frame-rate-1280x720" range="75-75" /> <!-- N=114 v98%=1.2 -->
+ <Limit name="measured-frame-rate-1920x1080" range="36-36" /> <!-- N=114 v98%=1.1 -->
</MediaCodec>
<MediaCodec name="OMX.google.mpeg4.encoder" type="video/mp4v-es" update="true">
- <Limit name="measured-frame-rate-176x144" range="744-744" /> <!-- N=38 v93%=1.1 -->
+ <Limit name="measured-frame-rate-176x144" range="771-771" /> <!-- N=114 v98%=1.1 -->
</MediaCodec>
<MediaCodec name="OMX.google.vp8.encoder" type="video/x-vnd.on2.vp8" update="true">
- <Limit name="measured-frame-rate-320x180" range="139-145" /> <!-- N=38 v93%=1.2 -->
- <Limit name="measured-frame-rate-640x360" range="85-85" /> <!-- N=38 v93%=1.1 -->
- <Limit name="measured-frame-rate-1280x720" range="35-35" /> <!-- N=38 v93%=1.1 -->
- <Limit name="measured-frame-rate-1920x1080" range="18-19" /> <!-- N=38 v93%=1.1 -->
+ <Limit name="measured-frame-rate-320x180" range="160-160" /> <!-- N=114 v98%=1.2 -->
+ <Limit name="measured-frame-rate-640x360" range="100-100" /> <!-- N=114 v98%=1.1 -->
+ <Limit name="measured-frame-rate-1280x720" range="36-36" /> <!-- N=114 v98%=1.0 -->
+ <Limit name="measured-frame-rate-1920x1080" range="26-26" /> <!-- N=114 v98%=1.1 -->
</MediaCodec>
</Encoders>
<Decoders>
<MediaCodec name="OMX.Nvidia.h263.decode" type="video/3gpp" update="true">
- <Limit name="measured-frame-rate-176x144" range="1967-1967" /> <!-- N=38 v93%=1.5 -->
- <Limit name="measured-frame-rate-352x288" range="1897-1897" /> <!-- N=38 v93%=1.4 -->
+ <Limit name="measured-frame-rate-176x144" range="2261-2261" /> <!-- N=102 v98%=1.5 -->
+ <Limit name="measured-frame-rate-352x288" range="2227-2227" /> <!-- N=102 v98%=1.5 -->
</MediaCodec>
<MediaCodec name="OMX.Nvidia.h264.decode" type="video/avc" update="true">
- <Limit name="measured-frame-rate-320x240" range="1816-1816" /> <!-- N=38 v93%=1.2 -->
- <Limit name="measured-frame-rate-720x480" range="994-995" /> <!-- N=38 v93%=1.0 -->
- <Limit name="measured-frame-rate-1280x720" range="471-471" /> <!-- N=38 v93%=1.0 -->
- <Limit name="measured-frame-rate-1920x1088" range="210-210" /> <!-- N=38 v93%=1.0 -->
+ <Limit name="measured-frame-rate-320x240" range="2020-2020" /> <!-- N=102 v98%=1.2 -->
+ <Limit name="measured-frame-rate-720x480" range="1000-1000" /> <!-- N=102 v98%=1.0 -->
+ <Limit name="measured-frame-rate-1280x720" range="471-471" /> <!-- N=102 v98%=1.1 -->
+ <Limit name="measured-frame-rate-1920x1080" range="212-212" /> <!-- N=102 v98%=1.1 -->
</MediaCodec>
<MediaCodec name="OMX.Nvidia.h265.decode" type="video/hevc" update="true">
- <!-- measured 93%:1355-2968 med:1667 SLOW -->
- <Limit name="measured-frame-rate-352x288" range="1666-2005" /> <!-- N=38 v93%=1.5 -->
- <Limit name="measured-frame-rate-640x368" range="1770-1770" /> <!-- N=38 v93%=1.3 -->
- <Limit name="measured-frame-rate-720x480" range="1526-1526" /> <!-- N=38 v93%=1.2 -->
- <Limit name="measured-frame-rate-1280x720" range="701-701" /> <!-- N=38 v93%=1.0 -->
- <Limit name="measured-frame-rate-1920x1088" range="355-355" /> <!-- N=38 v93%=1.0 -->
- <Limit name="measured-frame-rate-3840x2160" range="89-89" /> <!-- N=38 v93%=1.0 -->
+ <Limit name="measured-frame-rate-352x288" range="2443-2443" /> <!-- N=102 v98%=1.4 -->
+ <Limit name="measured-frame-rate-640x360" range="1974-1974" /> <!-- N=102 v98%=1.2 -->
+ <Limit name="measured-frame-rate-720x480" range="1563-1563" /> <!-- N=102 v98%=1.1 -->
+ <Limit name="measured-frame-rate-1280x720" range="702-702" /> <!-- N=102 v98%=1.1 -->
+ <Limit name="measured-frame-rate-1920x1080" range="356-356" /> <!-- N=102 v98%=1.1 -->
+ <Limit name="measured-frame-rate-3840x2160" range="89-89" /> <!-- N=102 v98%=1.1 -->
</MediaCodec>
<MediaCodec name="OMX.Nvidia.mp4.decode" type="video/mp4v-es" update="true">
- <!-- measured 93%:1394-3077 med:1761 SLOW -->
- <Limit name="measured-frame-rate-176x144" range="1760-2072" /> <!-- N=38 v93%=1.5 -->
- <Limit name="measured-frame-rate-480x368" range="2034-2034" /> <!-- N=38 v93%=1.6 -->
+ <Limit name="measured-frame-rate-176x144" range="2300-2300" /> <!-- N=102 v98%=1.5 -->
+ <!-- measured 98%:1456-3323 med:2336/2314 FLAKY(mn=601.0 < 1157 - 4628) -->
+ <Limit name="measured-frame-rate-480x360" range="2314-2314" /> <!-- N=102 v98%=1.5 -->
</MediaCodec>
<MediaCodec name="OMX.Nvidia.vp8.decode" type="video/x-vnd.on2.vp8" update="true">
- <Limit name="measured-frame-rate-320x192" range="1718-1874" /> <!-- N=38 v93%=1.4 -->
- <Limit name="measured-frame-rate-640x368" range="1364-1364" /> <!-- N=38 v93%=1.4 -->
- <Limit name="measured-frame-rate-1280x720" range="460-460" /> <!-- N=38 v93%=1.2 -->
- <Limit name="measured-frame-rate-1920x1088" range="233-233" /> <!-- N=38 v93%=1.1 -->
+ <Limit name="measured-frame-rate-320x180" range="2256-2256" /> <!-- N=102 v98%=1.4 -->
+ <Limit name="measured-frame-rate-640x360" range="1610-1610" /> <!-- N=102 v98%=1.4 -->
+ <Limit name="measured-frame-rate-1280x720" range="455-455" /> <!-- N=102 v98%=1.1 -->
+ <Limit name="measured-frame-rate-1920x1080" range="237-237" /> <!-- N=102 v98%=1.1 -->
</MediaCodec>
<MediaCodec name="OMX.Nvidia.vp9.decode" type="video/x-vnd.on2.vp9" update="true">
- <!-- measured 93%:1107-2778 med:1305 SLOW -->
- <Limit name="measured-frame-rate-320x180" range="1305-1754" /> <!-- N=38 v93%=1.6 -->
- <Limit name="measured-frame-rate-640x360" range="1253-1284" /> <!-- N=38 v93%=1.4 -->
- <Limit name="measured-frame-rate-1280x720" range="428-428" /> <!-- N=38 v93%=1.1 -->
- <Limit name="measured-frame-rate-1920x1080" range="246-246" /> <!-- N=38 v93%=1.1 -->
- <Limit name="measured-frame-rate-3840x2160" range="63-64" /> <!-- N=38 v93%=1.0 -->
+ <Limit name="measured-frame-rate-320x180" range="1883-1883" /> <!-- N=102 v98%=1.5 -->
+ <Limit name="measured-frame-rate-640x360" range="1334-1334" /> <!-- N=102 v98%=1.2 -->
+ <Limit name="measured-frame-rate-1280x720" range="413-413" /> <!-- N=102 v98%=1.3 -->
+ <Limit name="measured-frame-rate-1920x1080" range="240-240" /> <!-- N=102 v98%=1.2 -->
+ <Limit name="measured-frame-rate-3840x2160" range="64-64" /> <!-- N=102 v98%=1.2 -->
</MediaCodec>
<MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" update="true">
- <!-- measured 93%:704-1170 med:792 SLOW -->
- <Limit name="measured-frame-rate-176x144" range="792-908" /> <!-- N=38 v93%=1.3 -->
+ <Limit name="measured-frame-rate-176x144" range="843-843" /> <!-- N=102 v98%=1.4 -->
</MediaCodec>
<MediaCodec name="OMX.google.h264.decoder" type="video/avc" update="true">
- <Limit name="measured-frame-rate-320x240" range="478-478" /> <!-- N=38 v93%=1.3 -->
- <Limit name="measured-frame-rate-720x480" range="181-181" /> <!-- N=38 v93%=1.0 -->
- <Limit name="measured-frame-rate-1280x720" range="70-70" /> <!-- N=38 v93%=1.0 -->
- <Limit name="measured-frame-rate-1920x1080" range="31-32" /> <!-- N=38 v93%=1.0 -->
+ <Limit name="measured-frame-rate-320x240" range="554-554" /> <!-- N=102 v98%=1.5 -->
+ <Limit name="measured-frame-rate-720x480" range="183-183" /> <!-- N=102 v98%=1.1 -->
+ <Limit name="measured-frame-rate-1280x720" range="68-68" /> <!-- N=102 v98%=1.1 -->
+ <Limit name="measured-frame-rate-1920x1080" range="32-32" /> <!-- N=102 v98%=1.1 -->
</MediaCodec>
<MediaCodec name="OMX.google.hevc.decoder" type="video/hevc" update="true">
- <Limit name="measured-frame-rate-352x288" range="677-685" /> <!-- N=38 v93%=1.1 -->
- <Limit name="measured-frame-rate-640x360" range="320-320" /> <!-- N=38 v93%=1.0 -->
- <Limit name="measured-frame-rate-720x480" range="275-275" /> <!-- N=38 v93%=1.1 -->
- <Limit name="measured-frame-rate-1280x720" range="106-106" /> <!-- N=38 v93%=1.0 -->
- <Limit name="measured-frame-rate-1920x1080" range="49-50" /> <!-- N=38 v93%=1.0 -->
+ <!-- measured 93%:493-804 med:706/705 FLAKY(mn=181.4 < 353 - 1410) -->
+ <Limit name="measured-frame-rate-352x288" range="705-705" /> <!-- N=106 v93%=1.3 -->
+ <!-- measured 97%:315-375 med:355/354 FLAKY(mn=130.6 < 177 - 708) -->
+ <Limit name="measured-frame-rate-640x360" range="354-354" /> <!-- N=104 v97%=1.1 -->
+ <!-- measured 97%:251-336 med:310/310 FLAKY(mn=123.5 < 155 - 620) -->
+ <Limit name="measured-frame-rate-720x480" range="310-310" /> <!-- N=104 v97%=1.2 -->
+ <Limit name="measured-frame-rate-1280x720" range="116-116" /> <!-- N=102 v98%=1.1 -->
+ <Limit name="measured-frame-rate-1920x1080" range="54-54" /> <!-- N=102 v98%=1.1 -->
</MediaCodec>
<MediaCodec name="OMX.google.mpeg4.decoder" type="video/mp4v-es" update="true">
- <Limit name="measured-frame-rate-176x144" range="881-930" /> <!-- N=38 v93%=1.4 -->
+ <Limit name="measured-frame-rate-176x144" range="961-961" /> <!-- N=102 v98%=1.6 -->
</MediaCodec>
<MediaCodec name="OMX.google.vp8.decoder" type="video/x-vnd.on2.vp8" update="true">
- <Limit name="measured-frame-rate-320x180" range="900-904" /> <!-- N=38 v93%=1.1 -->
- <Limit name="measured-frame-rate-640x360" range="314-314" /> <!-- N=38 v93%=1.0 -->
- <Limit name="measured-frame-rate-1280x720" range="67-67" /> <!-- N=38 v93%=1.0 -->
- <Limit name="measured-frame-rate-1920x1080" range="26-27" /> <!-- N=38 v93%=1.0 -->
+ <!-- measured 98%:775-1050 med:945/940 FLAKY(mn=148.4 < 470 - 1880) -->
+ <Limit name="measured-frame-rate-320x180" range="940-940" /> <!-- N=102 v98%=1.2 -->
+ <Limit name="measured-frame-rate-640x360" range="327-327" /> <!-- N=102 v98%=1.1 -->
+ <!-- measured 98%:59-71 med:69/69 N=96 -->
+ <Limit name="measured-frame-rate-1280x720" range="69-69" /> <!-- v98%=1.1 -->
+ <Limit name="measured-frame-rate-1920x1080" range="27-27" /> <!-- N=102 v98%=1.0 -->
</MediaCodec>
<MediaCodec name="OMX.google.vp9.decoder" type="video/x-vnd.on2.vp9" update="true">
- <Limit name="measured-frame-rate-320x180" range="635-637" /> <!-- N=38 v93%=1.1 -->
- <Limit name="measured-frame-rate-640x360" range="315-315" /> <!-- N=38 v93%=1.0 -->
- <Limit name="measured-frame-rate-1280x720" range="91-92" /> <!-- N=38 v93%=1.0 -->
- <Limit name="measured-frame-rate-1920x1080" range="50-51" /> <!-- N=38 v93%=1.0 -->
+ <Limit name="measured-frame-rate-320x180" range="706-706" /> <!-- N=102 v98%=1.1 -->
+ <Limit name="measured-frame-rate-640x360" range="344-344" /> <!-- N=102 v98%=1.1 -->
+ <Limit name="measured-frame-rate-1280x720" range="147-147" /> <!-- N=102 v98%=1.3 -->
+ <Limit name="measured-frame-rate-1920x1080" range="83-83" /> <!-- N=102 v98%=1.3 -->
</MediaCodec>
</Decoders>
</MediaCodecs>
