diff options
| author | KalimochoAz <calimochoazucarado@gmail.com> | 2012-11-23 06:51:34 +0100 |
|---|---|---|
| committer | KalimochoAz <calimochoazucarado@gmail.com> | 2012-11-23 06:51:34 +0100 |
| commit | 45bc4b754b3a89d39caac8f9b58b14182c67ecf6 (patch) | |
| tree | 5c052d202b6c9ce9219b5c97167319677a9889f4 /BoardConfig.mk | |
| parent | 8dc38ab89576751c794f2a8a675628f38718f246 (diff) | |
| parent | 214d003a47e7fe2962df667c5d65bce92a21a40e (diff) | |
| download | device_samsung_tuna-45bc4b754b3a89d39caac8f9b58b14182c67ecf6.zip device_samsung_tuna-45bc4b754b3a89d39caac8f9b58b14182c67ecf6.tar.gz device_samsung_tuna-45bc4b754b3a89d39caac8f9b58b14182c67ecf6.tar.bz2 | |
Merge remote-tracking branch 'remotes/google/jb-mr1-release' into HEAD
Conflicts:
audio/audio_hw.c
init.tuna.rc
overlay/frameworks/base/core/res/res/xml/storage_list.xml
recovery/Android.mk
Change-Id: I0b13c6b5e61ea709b0e9aaa1c7b798684b33873a
Diffstat (limited to 'BoardConfig.mk')
| -rw-r--r-- | BoardConfig.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index 5cd94ee..b8151f3 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -21,9 +21,14 @@ USE_CAMERA_STUB := true # Use the non-open-source parts, if they're present -include vendor/samsung/tuna/BoardConfigVendor.mk +# Default values, if not overridden else where. +TARGET_BOARD_INFO_FILE ?= device/samsung/tuna/board-info.txt +BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR ?= device/samsung/tuna/bluetooth + TARGET_CPU_ABI := armeabi-v7a TARGET_CPU_ABI2 := armeabi TARGET_CPU_SMP := true +TARGET_ARCH := arm TARGET_ARCH_VARIANT := armv7-a-neon ARCH_ARM_HAVE_TLS_REGISTER := true @@ -41,7 +46,6 @@ TARGET_PREBUILT_KERNEL := device/samsung/tuna/kernel TARGET_NO_RADIOIMAGE := true TARGET_BOARD_PLATFORM := omap4 TARGET_BOOTLOADER_BOARD_NAME := tuna -TARGET_BOARD_INFO_FILE ?= device/samsung/tuna/board-info.txt BOARD_EGL_CFG := device/samsung/tuna/egl.cfg BOARD_CREATE_TUNA_HDCP_KEYS_SYMLINK := true |