Snap for 5475808 from b5fc0cb2f36be563bb69959d7e181a5552c02385 to sdk-release

Change-Id: I9eae483bc14d0908a11657886c4d1ee2e543d108

15 files changed, 70 insertions, 14 deletions

diff --git a/device-common.mk b/device-common.mk
index e38e9c8d..525ae8d9 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -81,6 +81,7 @@ PRODUCT_PACKAGES += vndk_package
 PRODUCT_PACKAGES += \
     android.hardware.drm@1.0-impl \
     android.hardware.drm@1.0-service \
+    android.hardware.bluetooth.audio@2.0-impl
 
 PRODUCT_PACKAGES += libGLES_android
 
@@ -92,11 +93,6 @@ PRODUCT_PACKAGES += \
     android.hardware.graphics.composer@2.1-service \
     android.hardware.graphics.mapper@2.0-impl
 
-ifeq ($(HIKEY_USE_DRM_HWCOMPOSER), true)
-  BOARD_USES_DRM_HWCOMPOSER := true
-  PRODUCT_PACKAGES += hwcomposer.drm
-endif
-
 # Memtrack
 PRODUCT_PACKAGES += memtrack.default \
     android.hardware.memtrack@1.0-service \
@@ -239,6 +235,9 @@ PRODUCT_COPY_FILES += \
         device/linaro/hikey/etc/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \
         frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml
 
+PRODUCT_COPY_FILES += \
+    device/linaro/hikey/init.common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.common.rc \
+
 PRODUCT_PACKAGES += \
     android.hardware.renderscript@1.0.vndk-sp\
     android.hardware.graphics.composer@2.1.vndk-sp\
diff --git a/gralloc/Android.bp b/gralloc/Android.bp
new file mode 100644
index 00000000..a198df52
--- /dev/null
+++ b/gralloc/Android.bp
@@ -0,0 +1,6 @@
+cc_library_shared {
+    name: "hwcomposer.drm_hikey",
+    defaults: ["hwcomposer.drm_defaults"],
+    srcs: [":drm_hwcomposer_platformhisi"],
+    whole_static_libs: ["drm_hwcomposer"],
+}
diff --git a/gralloc/gralloc_priv.h b/gralloc/gralloc_priv.h
index 3330eae8..14cb07a8 100644
--- a/gralloc/gralloc_priv.h
+++ b/gralloc/gralloc_priv.h
@@ -170,6 +170,8 @@ struct private_handle_t
 	union {
 		int     format;
 		int	req_format; /* same name as gralloc960 */
+		/*unused but referenced in drm_hwc */
+		int	internal_format;
 	};
 	int     stride;
 	union
diff --git a/gralloc960/Android.bp b/gralloc960/Android.bp
new file mode 100644
index 00000000..37d60a16
--- /dev/null
+++ b/gralloc960/Android.bp
@@ -0,0 +1,6 @@
+cc_library_shared {
+    name: "hwcomposer.drm_hikey960",
+    defaults: ["hwcomposer.drm_defaults"],
+    srcs: [":drm_hwcomposer_platformhisi"],
+    whole_static_libs: ["drm_hwcomposer"],
+}
diff --git a/hikey/device-hikey.mk b/hikey/device-hikey.mk
index 99fdb508..70680e55 100644
--- a/hikey/device-hikey.mk
+++ b/hikey/device-hikey.mk
@@ -18,7 +18,7 @@ PRODUCT_COPY_FILES +=   $(TARGET_PREBUILT_KERNEL):kernel \
                         $(TARGET_PREBUILT_DTB):hi6220-hikey.dtb \
 			$(LOCAL_PATH)/$(TARGET_FSTAB):$(TARGET_COPY_OUT_VENDOR)/etc/fstab.hikey \
 			device/linaro/hikey/fstab.ramdisk:$(TARGET_COPY_OUT_RAMDISK)/fstab.hikey \
-			device/linaro/hikey/init.common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.hikey.rc \
+			device/linaro/hikey/hikey/init.hikey.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.hikey.rc \
 			device/linaro/hikey/init.hikey.power.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.hikey.power.rc \
 			device/linaro/hikey/init.common.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.hikey.usb.rc \
 			device/linaro/hikey/ueventd.common.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc \
@@ -51,6 +51,10 @@ PRODUCT_PACKAGES += power.hikey
 # Sensors HAL
 PRODUCT_PACKAGES += sensors.hikey
 
+ifeq ($(HIKEY_USE_DRM_HWCOMPOSER), true)
+  PRODUCT_PACKAGES += hwcomposer.drm_hikey
+endif
+
 # Include mali blobs from ARM
 PRODUCT_PACKAGES += libGLES_mali.so END_USER_LICENCE_AGREEMENT.txt
 
diff --git a/hikey/init.hikey.rc b/hikey/init.hikey.rc
new file mode 100644
index 00000000..8046f91f
--- /dev/null
+++ b/hikey/init.hikey.rc
@@ -0,0 +1,6 @@
+import init.common.rc
+
+on post-fs
+    # Set supported opengles version
+    setprop ro.hardware.hwcomposer drm_hikey
+
diff --git a/hikey960/device-hikey960.mk b/hikey960/device-hikey960.mk
index c1d697a1..2695698e 100644
--- a/hikey960/device-hikey960.mk
+++ b/hikey960/device-hikey960.mk
@@ -19,7 +19,7 @@ PRODUCT_COPY_FILES +=	$(TARGET_PREBUILT_KERNEL):kernel \
 
 PRODUCT_COPY_FILES +=	$(LOCAL_PATH)/fstab.hikey960:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.hikey960 \
 			device/linaro/hikey/fstab.ramdisk:$(TARGET_COPY_OUT_RAMDISK)/fstab.hikey960 \
-			device/linaro/hikey/init.common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.hikey960.rc \
+			device/linaro/hikey/hikey960/init.hikey960.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.hikey960.rc \
 			device/linaro/hikey/init.hikey960.power.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.hikey960.power.rc \
 			device/linaro/hikey/init.common.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.hikey960.usb.rc \
 			device/linaro/hikey/ueventd.common.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc \
@@ -73,6 +73,10 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += sys.usb.controller=ff100000.dwc3
 
 PRODUCT_PACKAGES += sensors.hikey960
 
+ifeq ($(HIKEY_USE_DRM_HWCOMPOSER), true)
+  PRODUCT_PACKAGES += hwcomposer.drm_hikey960
+endif
+
 # Unfortunately inherit-product doesn't export build variables from the
 # called make file to the caller, so we have to include it directly here.
 # FIXME: Improve this the next time we update the binary package
diff --git a/hikey960/init.hikey960.rc b/hikey960/init.hikey960.rc
new file mode 100644
index 00000000..b7671340
--- /dev/null
+++ b/hikey960/init.hikey960.rc
@@ -0,0 +1,6 @@
+import init.common.rc
+
+on post-fs
+    # Set supported opengles version
+    setprop ro.hardware.hwcomposer drm_hikey960
+
diff --git a/init.common.rc b/init.common.rc
index 6d66ca7f..d802936d 100644
--- a/init.common.rc
+++ b/init.common.rc
@@ -53,12 +53,13 @@ on post-fs
     setprop status.battery.level_raw  50
     setprop status.battery.level_scale 9
 
-# Set supported opengles version
-    setprop ro.hardware.hwcomposer drm
-
 # If an app forces screen rotation, revert it once the apps closes
     setprop persist.demo.rotationlock 1
 
+# avoid USB crash
+    setprop persist.adb.nonblocking_ffs 0
+    setprop ro.adb.nonblocking_ffs 0
+
 # enable Google-specific location features,
 # like NetworkLocationProvider and LocationCollector
     setprop ro.com.google.locationfeatures 1
diff --git a/mali/bifrost/Android.mk b/mali/bifrost/Android.mk
index a4f6aced..4ea05a7e 100644
--- a/mali/bifrost/Android.mk
+++ b/mali/bifrost/Android.mk
@@ -19,6 +19,7 @@ LOCAL_SRC_FILES_arm64 := lib64/egl/$(LOCAL_MODULE)
 LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib/egl/
 LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64/egl/
 LOCAL_MULTILIB := both
+LOCAL_SHARED_LIBRARIES := android.hardware.graphics.common@1.0 libz libnativewindow libc++ liblog libm libc libdl
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
@@ -28,6 +29,9 @@ LOCAL_STRIP_MODULE := false
 LOCAL_SRC_FILES_arm64 := lib64/$(LOCAL_MODULE)
 LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64/
 LOCAL_MULTILIB := 64
+# Bypass prebuilt ELF check because libLLVM is not a module (it is copied by
+# PRODUCT_COPY_FILES instead).
+LOCAL_CHECK_ELF_FILES := false
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
@@ -39,6 +43,7 @@ LOCAL_SRC_FILES_arm64 := lib64/$(LOCAL_MODULE)
 LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib/
 LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64/
 LOCAL_MULTILIB := both
+LOCAL_SHARED_LIBRARIES := libRS_internal libRSCpuRef liblog libnativewindow libbcinfo libdl libc++ libc libm
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
@@ -61,6 +66,10 @@ LOCAL_SRC_FILES_arm64 := lib64/hw/$(LOCAL_MODULE)
 LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib/hw
 LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64/hw
 LOCAL_MULTILIB := both
+LOCAL_SHARED_LIBRARIES := android.hardware.graphics.common@1.0 libz libnativewindow libc++ liblog libm libc libdl
+# Bypass prebuilt ELF check because the DT_SONAME "libGLES_mali.so" is
+# different from LOCAL_MODULE "vulkan.hikey960.so".
+LOCAL_CHECK_ELF_FILES := false
 include $(BUILD_PREBUILT)
 
 endif
diff --git a/mali/utgard/Android.mk b/mali/utgard/Android.mk
index 071cdd24..3e9ccec8 100644
--- a/mali/utgard/Android.mk
+++ b/mali/utgard/Android.mk
@@ -8,6 +8,7 @@ LOCAL_STRIP_MODULE := false
 LOCAL_SRC_FILES_arm := $(LOCAL_MODULE)
 LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)
 LOCAL_MULTILIB := 32
+LOCAL_SHARED_LIBRARIES := libc++ libc libdl liblog libm
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
@@ -19,6 +20,7 @@ LOCAL_SRC_FILES_arm64 := lib64/egl/$(LOCAL_MODULE)
 LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib/egl/
 LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64/egl/
 LOCAL_MULTILIB := both
+LOCAL_SHARED_LIBRARIES := libc++ libc libdl liblog libm
 include $(BUILD_PREBUILT)
 
 endif
diff --git a/manifest.xml b/manifest.xml
index 1459ee8a..f45676c6 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -27,6 +27,15 @@
         </interface>
     </hal>
     <hal format="hidl">
+        <name>android.hardware.bluetooth.audio</name>
+        <transport>hwbinder</transport>
+        <version>2.0</version>
+        <interface>
+            <name>IBluetoothAudioProvidersFactory</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
         <name>android.hardware.broadcastradio</name>
         <transport arch="32+64">passthrough</transport>
         <version>1.0</version>
diff --git a/recovery/Android.bp b/recovery/Android.bp
index 17dde5f0..0fd89068 100644
--- a/recovery/Android.bp
+++ b/recovery/Android.bp
@@ -26,7 +26,8 @@ cc_library_static {
     srcs: [
         "recovery_ui.cpp",
     ],
-    include_dirs: [
-        "bootable/recovery"
+
+    shared_libs: [
+        "librecovery_ui",
     ],
 }
diff --git a/recovery/recovery_ui.cpp b/recovery/recovery_ui.cpp
index d67ff5f8..e82be6a6 100644
--- a/recovery/recovery_ui.cpp
+++ b/recovery/recovery_ui.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <device.h>
-#include <screen_ui.h>
+#include <recovery_ui/device.h>
+#include <recovery_ui/screen_ui.h>
 
 namespace android {
 namespace device {
diff --git a/sepolicy/genfs_contexts b/sepolicy/genfs_contexts
index fbea22aa..ef5b785e 100644
--- a/sepolicy/genfs_contexts
+++ b/sepolicy/genfs_contexts
@@ -1,2 +1,3 @@
 # sysfs
 genfscon sysfs /devices/virtual/nanohub/nanohub       u:object_r:sysfs_nanoapp_cmd:s0
+genfscon sysfs /devices/platform/soc/fff04000.rtc/rtc	u:object_r:sysfs_rtc:s0