Add v13 to the compatibility package.
Also remove ApiDemos from the package and instead
add each library-specific sample app to each v##
folder.
Change-Id: I2932bbb91c7122c122973902d1fcd159ca899381
diff --git a/build/Android.mk b/build/Android.mk
index 7e5d180..8990d92 100644
--- a/build/Android.mk
+++ b/build/Android.mk
@@ -75,3 +75,13 @@
$(hide)$(ACP) $< $@
ALL_SDK_FILES += $(android-support-v4_full_target)
+
+android-support-v13_build_module := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android-support-v13_intermediates/javalib.jar
+android-support-v13_intermediates := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/android-support-v13_intermediates
+android-support-v13_full_target := $(android-support-v13_intermediates)/android-support-v13.jar
+$(android-support-v13_full_target): $(android-support-v13_build_module)
+ @echo Package android-support-v13.jar: $@
+ $(hide)mkdir -p $(dir $@)
+ $(hide)$(ACP) $< $@
+
+ALL_SDK_FILES += $(android-support-v13_full_target)
diff --git a/build/sdk.atree b/build/sdk.atree
index e5da0a2..97317c4 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -154,7 +154,6 @@
development/samples/AccessibilityService samples/${PLATFORM_NAME}/AccessibilityService
development/samples/AccelerometerPlay samples/${PLATFORM_NAME}/AccelerometerPlay
development/samples/ApiDemos samples/${PLATFORM_NAME}/ApiDemos
-${OUT_DIR}/target/common/obj/PACKAGING/android-support-v4_intermediates/android-support-v4.jar samples/${PLATFORM_NAME}/ApiDemos/libs/android-support-v4.jar
development/samples/BackupRestore samples/${PLATFORM_NAME}/BackupRestore
development/samples/BasicGLSurfaceView samples/${PLATFORM_NAME}/BasicGLSurfaceView
development/samples/BluetoothChat samples/${PLATFORM_NAME}/BluetoothChat
@@ -210,4 +209,7 @@
sdk/files/sdk_files_NOTICE.txt extras/android/compatibility/NOTICE.txt
${OUT_DIR}/target/common/obj/PACKAGING/android-support-v4_intermediates/android-support-v4.jar extras/android/compatibility/v4/android-support-v4.jar
frameworks/support/v4 extras/android/compatibility/v4/src
-development/samples/ApiDemos extras/android/compatibility/v4/samples/ApiDemos
+development/samples/Support4Demos extras/android/compatibility/v4/samples/Support4Demos
+${OUT_DIR}/target/common/obj/PACKAGING/android-support-v13_intermediates/android-support-v13.jar extras/android/compatibility/v13/android-support-v13.jar
+frameworks/support/v13 extras/android/compatibility/v13/src
+development/samples/Support13Demos extras/android/compatibility/v13/samples/Support13Demos