Merge "Update the CarSupportLib SDK target to 23" into nyc-car-dev
diff --git a/Android.mk b/Android.mk
index 981a873..b33eecc 100644
--- a/Android.mk
+++ b/Android.mk
@@ -17,7 +17,7 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
-CAR_CURRENT_SDK_VERSION := current
+CAR_CURRENT_SDK_VERSION := 23
CAR_API_CHECK := $(LOCAL_PATH)/apicheck.mk
api_check_current_msg_file := $(LOCAL_PATH)/apicheck_msg_current.txt
api_check_last_msg_file := $(LOCAL_PATH)/apicheck_msg_last.txt
diff --git a/car-support-lib/Android.mk b/car-support-lib/Android.mk
index 2832bb5..d2ded7e 100644
--- a/car-support-lib/Android.mk
+++ b/car-support-lib/Android.mk
@@ -33,7 +33,7 @@
LOCAL_RESOURCE_DIR += frameworks/support/v7/appcompat/res
LOCAL_RESOURCE_DIR += frameworks/support/v7/recyclerview/res
LOCAL_RESOURCE_DIR += frameworks/support/v7/cardview/res
-LOCAL_SDK_VERSION := current
+LOCAL_SDK_VERSION := 23
LOCAL_MANIFEST_FILE := AndroidManifest.xml
@@ -58,7 +58,7 @@
# Build the resources.
include $(CLEAR_VARS)
LOCAL_MODULE := android.support.car-res
-LOCAL_SDK_VERSION := current
+LOCAL_SDK_VERSION := 23
LOCAL_SRC_FILES := $(call all-java-files-under, dummy)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_RESOURCE_DIR += frameworks/support/v7/appcompat/res
@@ -81,7 +81,7 @@
LOCAL_MODULE := android.support.car
-LOCAL_SDK_VERSION := current
+LOCAL_SDK_VERSION := 23
LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-Iaidl-files-under, src)
diff --git a/car-support-lib/AndroidManifest.xml b/car-support-lib/AndroidManifest.xml
index 3d79e54..36b1649 100644
--- a/car-support-lib/AndroidManifest.xml
+++ b/car-support-lib/AndroidManifest.xml
@@ -17,6 +17,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
package="android.support.car.ui" >
- <uses-sdk android:minSdkVersion="22"
- android:targetSdkVersion="22" />
+ <uses-sdk android:minSdkVersion="23"
+ android:targetSdkVersion="23" />
</manifest>