Fix building errors of nougat-x86

diff --git a/gpu/gpu_mesa.mk b/gpu/gpu_mesa.mk
index 16e17d5..b04ec64 100644 (file)
--- a/gpu/gpu_mesa.mk
+++ b/gpu/gpu_mesa.mk
@@ -9,7 +9,6 @@
 #
 
 PRODUCT_PACKAGES := \
-    hwcomposer.drm  \
     gralloc.drm     \
     libGLES_mesa    \
     libtxc_dxtn     \

diff --git a/nativebridge/src/libnb.cpp b/nativebridge/src/libnb.cpp
index 8172c92..aa963cf 100644 (file)
--- a/nativebridge/src/libnb.cpp
+++ b/nativebridge/src/libnb.cpp
@@ -115,14 +115,14 @@ static void __attribute__ ((destructor)) on_dlclose()
 extern "C" {
 
 NativeBridgeCallbacks NativeBridgeItf = {
-    version: 2,
-    initialize: &native_bridge2_initialize,
-    loadLibrary: &native_bridge2_loadLibrary,
-    getTrampoline: &native_bridge2_getTrampoline,
-    isSupported: &native_bridge2_isSupported,
-    getAppEnv: &native_bridge2_getAppEnv,
-    isCompatibleWith: &native_bridge2_is_compatible_compatible_with,
-    getSignalHandler: &native_bridge2_get_signal_handler,
+    .version = 2,
+    .initialize = &native_bridge2_initialize,
+    .loadLibrary = &native_bridge2_loadLibrary,
+    .getTrampoline = &native_bridge2_getTrampoline,
+    .isSupported = &native_bridge2_isSupported,
+    .getAppEnv = &native_bridge2_getAppEnv,
+    .isCompatibleWith = &native_bridge2_is_compatible_compatible_with,
+    .getSignalHandler = &native_bridge2_get_signal_handler,
 };
 
 } // extern "C"

diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index ec4dec5..2ac2eab 100644 (file)
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -53,19 +53,6 @@
         <item>"9,1"</item>
     </string-array>
 
-    <!-- Set of NetworkInfo.getType() that reflect data usage. -->
-    <integer-array translatable="false" name="config_data_usage_network_types">
-        <item>0</item> <!-- TYPE_MOBILE -->
-        <item>2</item> <!-- TYPE_MOBILE_MMS -->
-        <item>3</item> <!-- TYPE_MOBILE_SUPL -->
-        <item>4</item> <!-- TYPE_MOBILE_DUN -->
-        <item>5</item> <!-- TYPE_MOBILE_HIPRI -->
-        <item>9</item> <!-- TYPE_ETHERNET -->
-        <item>10</item> <!-- TYPE_MOBILE_FOTA -->
-        <item>11</item> <!-- TYPE_MOBILE_IMS -->
-        <item>12</item> <!-- TYPE_MOBILE_CBS -->
-    </integer-array>
-
     <!-- Sets whether menu shortcuts should be displayed on panel menus when
                   a keyboard is present. -->
     <bool name="config_showMenuShortcutsWhenKeyboardPresent">true</bool>