• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
Aucun tag

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

device/generic/common


Commit MetaInfo

Révisionb00bbe393cd990b7c740a7486cdcb4c086e86d34 (tree)
l'heure2016-10-07 03:52:13
AuteurJaap Jan Meijer <jjmeijer88@gmai...>
CommiterJaap Jan Meijer

Message de Log

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

Change Summary

Modification

--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -6,6 +6,7 @@ TARGET_BOARD_PLATFORM := android-x86
66
77 # Some framework code requires this to enable BT
88 BOARD_HAVE_BLUETOOTH := true
9+BOARD_HAVE_BLUETOOTH_LINUX := true
910
1011 BOARD_USE_LEGACY_UI := true
1112
@@ -74,7 +75,8 @@ TARGET_HARDWARE_3D := true
7475 BOARD_EGL_CFG ?= device/generic/common/gpu/egl_mesa.cfg
7576 endif
7677
77-BOARD_KERNEL_CMDLINE := root=/dev/ram0
78+BOARD_KERNEL_CMDLINE := root=/dev/ram0 androidboot.selinux=permissive
79+TARGET_KERNEL_DIFFCONFIG := device/generic/common/selinux_diffconfig
7880
7981 COMPATIBILITY_ENHANCEMENT_PACKAGE := true
8082 PRC_COMPATIBILITY_PACKAGE := true
--- a/device.mk
+++ b/device.mk
@@ -1,5 +1,5 @@
11 #
2-# Copyright (C) 2014 The Android-x86 Open Source Project
2+# Copyright (C) 2014-2016 The Android-x86 Open Source Project
33 #
44 # Licensed under the Apache License, Version 2.0 (the "License");
55 # you may not use this file except in compliance with the License.
@@ -47,6 +47,7 @@ PRODUCT_COPY_FILES += \
4747 device/sample/etc/old-apns-conf.xml:system/etc/old-apns-conf.xml \
4848 frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \
4949 frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \
50+ frameworks/base/compiled-classes-phone:system/etc/compiled-classes \
5051 frameworks/native/data/etc/tablet_core_hardware.xml:system/etc/permissions/tablet_core_hardware.xml \
5152 frameworks/native/data/etc/android.hardware.audio.low_latency.xml:system/etc/permissions/android.hardware.audio.low_latency.xml \
5253 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 @@
99 #
1010
1111 PRODUCT_PACKAGES := \
12- hwcomposer.drm \
1312 gralloc.drm \
1413 libGLES_mesa \
1514 libtxc_dxtn \
--- a/init.sh
+++ b/init.sh
@@ -401,6 +401,8 @@ function do_bootcomplete()
401401 alsa_amixer -c $c set 'Internal Mic Boost' 3
402402 fi
403403 done
404+
405+ post_bootcomplete
404406 }
405407
406408 function do_hci()
--- a/nativebridge/src/libnb.cpp
+++ b/nativebridge/src/libnb.cpp
@@ -115,14 +115,14 @@ static void __attribute__ ((destructor)) on_dlclose()
115115 extern "C" {
116116
117117 NativeBridgeCallbacks NativeBridgeItf = {
118- version: 2,
119- initialize: &native_bridge2_initialize,
120- loadLibrary: &native_bridge2_loadLibrary,
121- getTrampoline: &native_bridge2_getTrampoline,
122- isSupported: &native_bridge2_isSupported,
123- getAppEnv: &native_bridge2_getAppEnv,
124- isCompatibleWith: &native_bridge2_is_compatible_compatible_with,
125- getSignalHandler: &native_bridge2_get_signal_handler,
118+ .version = 2,
119+ .initialize = &native_bridge2_initialize,
120+ .loadLibrary = &native_bridge2_loadLibrary,
121+ .getTrampoline = &native_bridge2_getTrampoline,
122+ .isSupported = &native_bridge2_isSupported,
123+ .getAppEnv = &native_bridge2_getAppEnv,
124+ .isCompatibleWith = &native_bridge2_is_compatible_compatible_with,
125+ .getSignalHandler = &native_bridge2_get_signal_handler,
126126 };
127127
128128 } // 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 @@
5353 <item>"9,1"</item>
5454 </string-array>
5555
56- <!-- Set of NetworkInfo.getType() that reflect data usage. -->
57- <integer-array translatable="false" name="config_data_usage_network_types">
58- <item>0</item> <!-- TYPE_MOBILE -->
59- <item>2</item> <!-- TYPE_MOBILE_MMS -->
60- <item>3</item> <!-- TYPE_MOBILE_SUPL -->
61- <item>4</item> <!-- TYPE_MOBILE_DUN -->
62- <item>5</item> <!-- TYPE_MOBILE_HIPRI -->
63- <item>9</item> <!-- TYPE_ETHERNET -->
64- <item>10</item> <!-- TYPE_MOBILE_FOTA -->
65- <item>11</item> <!-- TYPE_MOBILE_IMS -->
66- <item>12</item> <!-- TYPE_MOBILE_CBS -->
67- </integer-array>
68-
6956 <!-- Sets whether menu shortcuts should be displayed on panel menus when
7057 a keyboard is present. -->
7158 <bool name="config_showMenuShortcutsWhenKeyboardPresent">true</bool>
--- /dev/null
+++ b/selinux_diffconfig
@@ -0,0 +1,7 @@
1+CONFIG_SECURITY_PATH=y
2+CONFIG_SECURITY_SELINUX_BOOTPARAM=y
3+CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
4+CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
5+CONFIG_DEFAULT_SECURITY_SELINUX=y
6+# CONFIG_DEFAULT_SECURITY_DAC is not set
7+CONFIG_DEFAULT_SECURITY="selinux"