• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Frequently used words (click to add to your profile)

javaandroidc++linuxc#objective-c誰得cocoaqtpythonrubywindowsphpgameguibathyscaphec翻訳omegat計画中(planning stage)frameworktwitterdombtronvb.nettestarduinodirectxpreviewerゲームエンジン

device/generic/x86


Commit MetaInfo

Revisione673a0c53fe5a9db43ded656afca94e8651128d3 (tree)
Time2017-08-23 11:17:29
AuthorChih-Wei Huang <cwhuang@linu...>
CommiterChih-Wei Huang

Log Message

Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86

Conflicts:
BoardConfig.mk

Change Summary

Incremental Difference

--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -1,5 +1,5 @@
11 #
2-# Copyright (C) 2011 The Android Open-Source Project
2+# Copyright (C) 2014 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.
@@ -15,4 +15,4 @@
1515 #
1616
1717 PRODUCT_MAKEFILES := \
18- $(LOCAL_DIR)/mini_x86.mk
18+ $(LOCAL_DIR)/android_x86.mk
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -4,30 +4,14 @@
44
55 # The generic product target doesn't have any hardware-specific pieces.
66 TARGET_NO_BOOTLOADER := true
7-TARGET_NO_KERNEL := true
87
98 TARGET_ARCH := x86
109 TARGET_CPU_ABI := x86
1110
12-SMALLER_FONT_FOOTPRINT := true
13-MINIMAL_FONT_FOOTPRINT := true
14-# Some framework code requires this to enable BT
15-BOARD_HAVE_BLUETOOTH := true
16-BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/generic/common/bluetooth
11+TARGET_CPU_ABI_LIST_32_BIT := $(TARGET_CPU_ABI) $(TARGET_CPU_ABI2) $(NATIVE_BRIDGE_ABI_LIST_32_BIT)
12+TARGET_CPU_ABI_LIST := $(TARGET_CPU_ABI_LIST_32_BIT)
1713
18-# Build OpenGLES emulation libraries
19-BUILD_EMULATOR_OPENGL := true
20-BUILD_EMULATOR_OPENGL_DRIVER := true
21-USE_OPENGL_RENDERER := true
22-
23-BOARD_USE_LEGACY_UI := true
24-
25-# share the same one across all mini-emulators
26-BOARD_EGL_CFG := device/generic/goldfish-opengl/system/egl/egl.cfg
27-
28-# PDK does not use ext4 image, but it is added here to prevent build break.
2914 TARGET_USERIMAGES_USE_EXT4 := true
30-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 576716800
3115 BOARD_USERDATAIMAGE_PARTITION_SIZE := 419430400
3216 BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016
3317 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
@@ -36,3 +20,5 @@ TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
3620
3721 BOARD_SEPOLICY_DIRS += build/target/board/generic/sepolicy
3822 BOARD_SEPOLICY_DIRS += build/target/board/generic_x86/sepolicy
23+
24+include device/generic/common/BoardConfig.mk
--- a/mini_x86.mk
+++ b/android_x86.mk
@@ -1,4 +1,5 @@
1-# Copyright (C) 2012 The Android Open Source Project
1+#
2+# Copyright (C) 2014 The Android-x86 Open Source Project
23 #
34 # Licensed under the Apache License, Version 2.0 (the "License");
45 # you may not use this file except in compliance with the License.
@@ -11,14 +12,13 @@
1112 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1213 # See the License for the specific language governing permissions and
1314 # limitations under the License.
15+#
1416
15-$(call inherit-product, device/generic/armv7-a-neon/mini_common.mk)
17+# includes the base of Android-x86 platform
18+$(call inherit-product,device/generic/common/x86.mk)
1619
17-PRODUCT_NAME := mini_x86
20+# Overrides
21+PRODUCT_NAME := android_x86
22+PRODUCT_BRAND := Android-x86
1823 PRODUCT_DEVICE := x86
19-PRODUCT_BRAND := Android
20-PRODUCT_MODEL := Mini for x86
21-
22-# default is nosdcard, S/W button enabled in resource
23-DEVICE_PACKAGE_OVERLAYS := device/generic/x86/overlay
24-PRODUCT_CHARACTERISTICS := nosdcard
24+PRODUCT_MODEL := Generic Android-x86
--- /dev/null
+++ b/vendorsetup.sh
@@ -0,0 +1,25 @@
1+#
2+# Copyright (C) 2014 The Android-x86 Open Source Project
3+#
4+# Licensed under the Apache License, Version 2.0 (the "License");
5+# you may not use this file except in compliance with the License.
6+# You may obtain a copy of the License at
7+#
8+# http://www.apache.org/licenses/LICENSE-2.0
9+#
10+# Unless required by applicable law or agreed to in writing, software
11+# distributed under the License is distributed on an "AS IS" BASIS,
12+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+# See the License for the specific language governing permissions and
14+# limitations under the License.
15+#
16+
17+# This file is executed by build/envsetup.sh, and can use anything
18+# defined in envsetup.sh.
19+#
20+# In particular, you can add lunch options with the add_lunch_combo
21+# function: add_lunch_combo generic-eng
22+
23+add_lunch_combo android_x86-eng
24+add_lunch_combo android_x86-userdebug
25+add_lunch_combo android_x86-user