android_x86_64: lollipop-x86 porting

Based on android-5.0.0_r2.

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 554ebc1..87681ca 100644 (file)
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014 The Android Open-Source Project
+# Copyright (C) 2014 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.
@@ -15,4 +15,4 @@
 #
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/mini_x86_64.mk
\ No newline at end of file
+    $(LOCAL_DIR)/android_x86_64.mk

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 9ade5ac..9d4cd47 100644 (file)
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -1,11 +1,9 @@
-# config.mk
 #
 # Product-specific compile-time definitions.
 #
 
 # The generic product target doesn't have any hardware-specific pieces.
 TARGET_NO_BOOTLOADER := true
-TARGET_NO_KERNEL := true
 TARGET_CPU_ABI := x86_64
 TARGET_ARCH := x86_64
 TARGET_ARCH_VARIANT := x86_64
@@ -15,25 +13,17 @@ TARGET_2ND_CPU_ABI := x86
 TARGET_2ND_ARCH := x86
 TARGET_2ND_ARCH_VARIANT := x86
 
-TARGET_USES_64_BIT_BINDER := true
-
-SMALLER_FONT_FOOTPRINT := true
-MINIMAL_FONT_FOOTPRINT := true
-# Disable emulator for "make dist" until there is a 64-bit qemu kernel
-BUILD_EMULATOR := false
-# Some framework code requires this to enable BT
-BOARD_HAVE_BLUETOOTH := true
-BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/generic/common/bluetooth
-
-USE_OPENGL_RENDERER := true
+TARGET_CPU_ABI_LIST_64_BIT := $(TARGET_CPU_ABI) $(TARGET_CPU_ABI2) $(NATIVE_BRIDGE_ABI_LIST_64_BIT)
+TARGET_CPU_ABI_LIST_32_BIT := $(TARGET_2ND_CPU_ABI) $(TARGET_2ND_CPU_ABI2) $(NATIVE_BRIDGE_ABI_LIST_32_BIT)
+TARGET_CPU_ABI_LIST := $(TARGET_CPU_ABI_LIST_64_BIT) $(TARGET_CPU_ABI_LIST_32_BIT)
 
-BOARD_USE_LEGACY_UI := true
+TARGET_USES_64_BIT_BINDER := true
 
-# PDK does not use ext4 image, but it is added here to prevent build break.
 TARGET_USERIMAGES_USE_EXT4 := true
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 786432000
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800
 BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016
 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
 BOARD_FLASH_BLOCK_SIZE := 512
-TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
\ No newline at end of file
+TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
+
+include device/generic/common/BoardConfig.mk

diff --git a/mini_x86_64.mk b/android_x86_64.mk
similarity index 62%
rename from mini_x86_64.mk
rename to android_x86_64.mk
index 869bc15..1375796 100644 (file)
--- a/mini_x86_64.mk
+++ b/android_x86_64.mk
@@ -1,4 +1,5 @@
-# Copyright (C) 2014 The Android Open Source Project
+#
+# Copyright (C) 2014 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.
@@ -11,14 +12,15 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+#
 
-$(call inherit-product, device/generic/armv7-a-neon/mini_common.mk)
+$(call inherit-product,$(SRC_TARGET_DIR)/product/core_64_bit.mk)
 
-PRODUCT_NAME := mini_x86_64
-PRODUCT_DEVICE := x86_64
-PRODUCT_BRAND := Android
-PRODUCT_MODEL := Mini for x86_64
+# includes the base of Android-x86 platform
+$(call inherit-product,device/generic/common/x86.mk)
 
-# default is nosdcard, S/W button enabled in resource
-DEVICE_PACKAGE_OVERLAYS := device/generic/x86/overlay
-PRODUCT_CHARACTERISTICS := nosdcard
+# Overrides
+PRODUCT_NAME := android_x86_64
+PRODUCT_BRAND := Android-x86
+PRODUCT_DEVICE := x86_64
+PRODUCT_MODEL := Generic Android-x86_64

diff --git a/vendorsetup.sh b/vendorsetup.sh
new file mode 100644 (file)
index 0000000..c568b1c
--- /dev/null
+++ b/vendorsetup.sh
@@ -0,0 +1,25 @@
+#
+# Copyright (C) 2014 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.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# This file is executed by build/envsetup.sh, and can use anything
+# defined in envsetup.sh.
+#
+# In particular, you can add lunch options with the add_lunch_combo
+# function: add_lunch_combo generic-eng
+
+add_lunch_combo android_x86_64-eng
+add_lunch_combo android_x86_64-userdebug
+add_lunch_combo android_x86_64-user