Initial JB MR1 bring-up support

Change-Id: I312af7ba7e843e5748ffc8eb42494cb33afd95d1
Nougat-Athene · Dec 6, 2012 · 7ffc571 · 7ffc571
1 parent a106cf1
commit 7ffc571
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/common.mk b/common.mk
@@ -549,7 +549,6 @@ PRODUCT_COPY_FILES += \
     system/bluetooth/data/audio.conf:system/etc/bluetooth/audio.conf \
     system/bluetooth/data/auto_pairing.conf:system/etc/bluetooth/auto_pairing.conf \
     system/bluetooth/data/blacklist.conf:system/etc/bluetooth/blacklist.conf \
-    system/bluetooth/data/iop_device_list.conf:system/etc/bluetooth/iop_device_list.conf \
     system/bluetooth/data/input.conf:system/etc/bluetooth/input.conf \
     system/bluetooth/data/network.conf:system/etc/bluetooth/network.conf \
 

diff --git a/power/Android.mk b/power/Android.mk
@@ -1,5 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 
+ifneq ($(call is-android-codename,JELLY_BEAN),true)
+
 # HAL module implemenation stored in
 # hw/<POWERS_HARDWARE_MODULE_ID>.<ro.hardware>.so
 include $(CLEAR_VARS)
@@ -10,3 +12,4 @@ LOCAL_SRC_FILES := power.c metadata-parser.c utils.c list.c hint-data.c
 LOCAL_MODULE := power.qcom
 LOCAL_MODULE_TAGS := optional
 include $(BUILD_SHARED_LIBRARY)
+endif
diff --git a/utils.mk b/utils.mk
@@ -154,7 +154,7 @@ FROYO_SDK_VERSIONS   := 8
 GINGERBREAD_SDK_VERSIONS := 9 10
 HONEYCOMB_SDK_VERSIONS := 11 12 13
 ICECREAM_SANDWICH_SDK_VERSIONS := 14 15
-JELLY_BEAN_SDK_VERSIONS := 16
+JELLY_BEAN_SDK_VERSIONS := 16 17
 
 # $(call is-android-codename,codename)
 # codename is one of cupcake,donut,eclair,froyo,gingerbread,icecream