device/generic/x86_64
Revision | 960e113423ca2ed1541cc9de06f043446e03e858 (tree) |
---|---|
Zeit | 2017-08-23 11:19:35 |
Autor | Chih-Wei Huang <cwhuang@linu...> |
Commiter | Chih-Wei Huang |
Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86
Conflicts:
BoardConfig.mk
@@ -1,5 +1,5 @@ | ||
1 | 1 | # |
2 | -# Copyright (C) 2014 The Android Open-Source Project | |
2 | +# Copyright (C) 2014 The Android-x86 Open Source Project | |
3 | 3 | # |
4 | 4 | # Licensed under the Apache License, Version 2.0 (the "License"); |
5 | 5 | # you may not use this file except in compliance with the License. |
@@ -15,4 +15,4 @@ | ||
15 | 15 | # |
16 | 16 | |
17 | 17 | PRODUCT_MAKEFILES := \ |
18 | - $(LOCAL_DIR)/mini_x86_64.mk | |
\ No newline at end of file | ||
18 | + $(LOCAL_DIR)/android_x86_64.mk |
@@ -1,11 +1,9 @@ | ||
1 | -# config.mk | |
2 | 1 | # |
3 | 2 | # Product-specific compile-time definitions. |
4 | 3 | # |
5 | 4 | |
6 | 5 | # The generic product target doesn't have any hardware-specific pieces. |
7 | 6 | TARGET_NO_BOOTLOADER := true |
8 | -TARGET_NO_KERNEL := true | |
9 | 7 | TARGET_CPU_ABI := x86_64 |
10 | 8 | TARGET_ARCH := x86_64 |
11 | 9 | TARGET_ARCH_VARIANT := x86_64 |
@@ -14,25 +12,15 @@ TARGET_2ND_CPU_ABI := x86 | ||
14 | 12 | TARGET_2ND_ARCH := x86 |
15 | 13 | TARGET_2ND_ARCH_VARIANT := x86_64 |
16 | 14 | |
17 | -TARGET_USES_64_BIT_BINDER := true | |
15 | +TARGET_CPU_ABI_LIST_64_BIT := $(TARGET_CPU_ABI) $(TARGET_CPU_ABI2) $(NATIVE_BRIDGE_ABI_LIST_64_BIT) | |
16 | +TARGET_CPU_ABI_LIST_32_BIT := $(TARGET_2ND_CPU_ABI) $(TARGET_2ND_CPU_ABI2) $(NATIVE_BRIDGE_ABI_LIST_32_BIT) | |
17 | +TARGET_CPU_ABI_LIST := $(TARGET_CPU_ABI) $(TARGET_CPU_ABI2) $(TARGET_2ND_CPU_ABI) $(TARGET_2ND_CPU_ABI2) $(NATIVE_BRIDGE_ABI_LIST_64_BIT) $(NATIVE_BRIDGE_ABI_LIST_32_BIT) | |
18 | 18 | |
19 | -SMALLER_FONT_FOOTPRINT := true | |
20 | -MINIMAL_FONT_FOOTPRINT := true | |
21 | -# Disable emulator for "make dist" until there is a 64-bit qemu kernel | |
22 | -BUILD_EMULATOR := false | |
23 | -# Some framework code requires this to enable BT | |
24 | -BOARD_HAVE_BLUETOOTH := true | |
25 | -BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/generic/common/bluetooth | |
26 | - | |
27 | -USE_OPENGL_RENDERER := true | |
28 | - | |
29 | -BOARD_USE_LEGACY_UI := true | |
30 | - | |
31 | -# PDK does not use ext4 image, but it is added here to prevent build break. | |
32 | 19 | TARGET_USERIMAGES_USE_EXT4 := true |
33 | -BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2147483648 | |
34 | 20 | BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800 |
35 | 21 | BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016 |
36 | 22 | BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4 |
37 | 23 | BOARD_FLASH_BLOCK_SIZE := 512 |
38 | 24 | TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true |
25 | + | |
26 | +include device/generic/common/BoardConfig.mk |
@@ -1,4 +1,5 @@ | ||
1 | -# Copyright (C) 2014 The Android Open Source Project | |
1 | +# | |
2 | +# Copyright (C) 2014 The Android-x86 Open Source Project | |
2 | 3 | # |
3 | 4 | # Licensed under the Apache License, Version 2.0 (the "License"); |
4 | 5 | # you may not use this file except in compliance with the License. |
@@ -11,15 +12,13 @@ | ||
11 | 12 | # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
12 | 13 | # See the License for the specific language governing permissions and |
13 | 14 | # limitations under the License. |
15 | +# | |
14 | 16 | |
15 | -$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) | |
16 | -$(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_64.mk) | |
17 | 19 | |
18 | -PRODUCT_NAME := mini_x86_64 | |
20 | +# Overrides | |
21 | +PRODUCT_NAME := android_x86_64 | |
22 | +PRODUCT_BRAND := Android-x86 | |
19 | 23 | PRODUCT_DEVICE := x86_64 |
20 | -PRODUCT_BRAND := Android | |
21 | -PRODUCT_MODEL := Mini for x86_64 | |
22 | - | |
23 | -# default is nosdcard, S/W button enabled in resource | |
24 | -DEVICE_PACKAGE_OVERLAYS := device/generic/x86/overlay | |
25 | -PRODUCT_CHARACTERISTICS := nosdcard | |
24 | +PRODUCT_MODEL := Generic Android-x86_64 |
@@ -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_64-eng | |
24 | +add_lunch_combo android_x86_64-userdebug | |
25 | +add_lunch_combo android_x86_64-user |