generic_x86: move app, keymaps and firmware to device/common/

[android-x86/build.git] / target / board / generic_x86 / AndroidBoard.mk

diff --git a/target/board/generic_x86/AndroidBoard.mk b/target/board/generic_x86/AndroidBoard.mk
index 9fd0075..8b544bb 100644 (file)
--- a/target/board/generic_x86/AndroidBoard.mk
+++ b/target/board/generic_x86/AndroidBoard.mk
@@ -23,11 +23,10 @@ DEFAULT_WPA_SUPPLICANT_CONF_DIR := $(LOCAL_PATH)
 
 $(call add-prebuilt-target,$(TARGET_ROOT_OUT),init.rc)
 
-TARGET_PREBUILT_APPS := $(subst $(LOCAL_PATH)/,,$(wildcard $(LOCAL_PATH)/app/*))
+LOCAL_PATH := device/common
+TARGET_PREBUILT_APPS := $(subst $(LOCAL_PATH)/,,$(wildcard $(LOCAL_PATH)/app/*.apk))
 $(call add-prebuilt-targets,$(TARGET_OUT),$(TARGET_PREBUILT_APPS))
 
-include $(call all-subdir-makefiles)
-
 define include-wpa-supplicant-conf
 LOCAL_PATH := $(1)
 include $$(CLEAR_VARS)
@@ -48,3 +47,5 @@ ifneq ($(BOARD_WPA_SUPPLICANT_DRIVER),)
 BOARD_WPA_SUPPLICANT_CONF_DIR ?= $(DEFAULT_WPA_SUPPLICANT_CONF_DIR)
 $(call add-wpa-supplicant-conf,$(BOARD_WPA_SUPPLICANT_CONF_DIR))
 endif
+
+-include device/common/firmware/firmware.mk