Fix x86 build.

Change-Id: I22dc39a68911e1b5846c20e63c0f8c59521ea7f5
2011-02-03 09:55:47 -08:00 · 2011-02-03 09:55:47 -08:00 · 4b35d1aba0
commit 4b35d1aba0
parent a0c5bd7b4a
2 changed files with 3 additions and 3 deletions
--- a/target/board/generic_x86/AndroidBoard.mk
+++ b/target/board/generic_x86/AndroidBoard.mk
@ -1,5 +1,3 @@
-LOCAL_PATH := $(call my-dir)
-
 ifeq ($(TARGET_PREBUILT_KERNEL),)
 LOCAL_KERNEL := prebuilt/android-x86/kernel/kernel
 else
@ -8,4 +6,4 @@ endif

 PRODUCT_COPY_FILES += \
    $(LOCAL_KERNEL):kernel \
-    $(LOCAL_PATH)/init.rc:root/init.rc
+    build/target/board/generic_x86/init.rc:root/init.rc
--- a/target/product/full_x86.mk
+++ b/target/product/full_x86.mk
@ -27,8 +27,10 @@ ifdef NET_ETH0_STARTONBOOT
 endif

 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86/device.mk)

 # Overrides
 PRODUCT_NAME := full_x86
 PRODUCT_DEVICE := generic_x86
+PRODUCT_BRAND := Android
 PRODUCT_MODEL := Full Android x86