Add split-select tool to SDK build.
Change-Id: I3889cb62587cdd8479cd91cee2412703f90cd91c
diff --git a/build/product_sdk.mk b/build/product_sdk.mk
index 7aba4ee..68a4ecc 100644
--- a/build/product_sdk.mk
+++ b/build/product_sdk.mk
@@ -44,4 +44,5 @@
layoutlib-tests \
llvm-rs-cc \
sqlite3 \
- vgabios-cirrus.bin
+ vgabios-cirrus.bin \
+ split-select
diff --git a/build/sdk-windows-x86.atree b/build/sdk-windows-x86.atree
index a0e19ba..7ff3add 100644
--- a/build/sdk-windows-x86.atree
+++ b/build/sdk-windows-x86.atree
@@ -61,6 +61,9 @@
rm build-tools/${PLATFORM_NAME}/aapt
bin/aapt.exe strip build-tools/${PLATFORM_NAME}/aapt.exe
+rm build-tools/${PLATFORM_NAME}/split-select
+bin/split-select.exe strip build-tools/${PLATFORM_NAME}/split-select.exe
+
rm build-tools/${PLATFORM_NAME}/aidl
bin/aidl.exe strip build-tools/${PLATFORM_NAME}/aidl.exe
diff --git a/build/sdk.atree b/build/sdk.atree
index 5021d83..0a781fc 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -79,6 +79,7 @@
# build tools from out/host/$(HOST_OS)-$(HOST_ARCH)/
bin/aapt strip build-tools/${PLATFORM_NAME}/aapt
bin/aidl strip build-tools/${PLATFORM_NAME}/aidl
+bin/split-select strip build-tools/${PLATFORM_NAME}/split-select
bin/zipalign strip build-tools/${PLATFORM_NAME}/zipalign
# renderscript (cc + headers)
diff --git a/build/tools/windows_sdk.mk b/build/tools/windows_sdk.mk
index d107d37..dadb773 100644
--- a/build/tools/windows_sdk.mk
+++ b/build/tools/windows_sdk.mk
@@ -41,6 +41,7 @@
prebuilt \
sqlite3 \
zipalign \
+ split-select \
$(WIN_SDK_TARGETS)
# This is the list of *Linux* build tools that we need
diff --git a/sdk/sdk_files_NOTICE.txt b/sdk/sdk_files_NOTICE.txt
index bb72a34..2b3d8b5 100644
--- a/sdk/sdk_files_NOTICE.txt
+++ b/sdk/sdk_files_NOTICE.txt
@@ -9740,6 +9740,7 @@
/bin/dexdump
/bin/dx
/bin/jasmin
+/bin/split-select
/framework/android-mock-generatorlib.jar
/framework/jasmin.jar
/lib/lib64cutils.a
