Commit: b00bbe393cd990b7c740a7486cdcb4c086e86d34 - device-generic-common (git)

device/generic/common

Commit MetaInfo

• Revision: b00bbe393cd990b7c740a7486cdcb4c086e86d34 (tree)
• Time: 2016-10-07 03:52:13
• Author: Jaap Jan Meijer <jjmeijer88@gmai...>
• Commiter: Jaap Jan Meijer

Log Message

Merge remote-tracking branch 'x86/nougat-x86' into cm-14.0-x86

Change Summary

• modified: BoardConfig.mk
• modified: device.mk
• modified: gpu/gpu_mesa.mk
• modified: init.sh
• modified: nativebridge/src/libnb.cpp
• modified: overlay/frameworks/base/core/res/res/values/config.xml
• add: selinux_diffconfig

Incremental Difference

--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -6,6 +6,7 @@ TARGET_BOARD_PLATFORM := android-x86
 
 # Some framework code requires this to enable BT
 BOARD_HAVE_BLUETOOTH := true
+BOARD_HAVE_BLUETOOTH_LINUX := true
 
 BOARD_USE_LEGACY_UI := true
 
@@ -74,7 +75,8 @@ TARGET_HARDWARE_3D := true
 BOARD_EGL_CFG ?= device/generic/common/gpu/egl_mesa.cfg
 endif
 
-BOARD_KERNEL_CMDLINE := root=/dev/ram0
+BOARD_KERNEL_CMDLINE := root=/dev/ram0 androidboot.selinux=permissive
+TARGET_KERNEL_DIFFCONFIG := device/generic/common/selinux_diffconfig
 
 COMPATIBILITY_ENHANCEMENT_PACKAGE := true
 PRC_COMPATIBILITY_PACKAGE := true

--- a/device.mk
+++ b/device.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014 The Android-x86 Open Source Project
+# Copyright (C) 2014-2016 The Android-x86 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.
@@ -47,6 +47,7 @@ PRODUCT_COPY_FILES += \
     device/sample/etc/old-apns-conf.xml:system/etc/old-apns-conf.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_video.xml:system/etc/media_codecs_google_video.xml \
+    frameworks/base/compiled-classes-phone:system/etc/compiled-classes \
     frameworks/native/data/etc/tablet_core_hardware.xml:system/etc/permissions/tablet_core_hardware.xml \
     frameworks/native/data/etc/android.hardware.audio.low_latency.xml:system/etc/permissions/android.hardware.audio.low_latency.xml \
     frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml \

--- a/gpu/gpu_mesa.mk
+++ b/gpu/gpu_mesa.mk
@@ -9,7 +9,6 @@
 #
 
 PRODUCT_PACKAGES := \
-    hwcomposer.drm  \
     gralloc.drm     \
     libGLES_mesa    \
     libtxc_dxtn     \

--- a/init.sh
+++ b/init.sh
@@ -401,6 +401,8 @@ function do_bootcomplete()
 			alsa_amixer -c $c set 'Internal Mic Boost' 3
 		fi
 	done
+
+	post_bootcomplete
 }
 
 function do_hci()

--- 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"

--- 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>

--- /dev/null
+++ b/selinux_diffconfig
@@ -0,0 +1,7 @@
+CONFIG_SECURITY_PATH=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
+CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
+CONFIG_DEFAULT_SECURITY_SELINUX=y
+# CONFIG_DEFAULT_SECURITY_DAC is not set
+CONFIG_DEFAULT_SECURITY="selinux"