diff options
| -rw-r--r-- | build/product_sdk.mk | 3 | ||||
| -rw-r--r-- | build/sdk-windows-x86.atree | 3 | ||||
| -rw-r--r-- | build/sdk.atree | 1 | ||||
| -rw-r--r-- | build/tools/windows_sdk.mk | 1 | ||||
| -rw-r--r-- | sdk/platform_source.prop_template | 4 | ||||
| -rw-r--r-- | sdk/sdk_files_NOTICE.txt | 1 |
6 files changed, 10 insertions, 3 deletions
diff --git a/build/product_sdk.mk b/build/product_sdk.mk index 7aba4ee67..68a4ecc60 100644 --- a/build/product_sdk.mk +++ b/build/product_sdk.mk @@ -44,4 +44,5 @@ PRODUCT_PACKAGES += \ 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 a0e19ba22..7ff3add13 100644 --- a/build/sdk-windows-x86.atree +++ b/build/sdk-windows-x86.atree @@ -61,6 +61,9 @@ bin/etc1tool.exe strip platform-tools/etc1tool.exe 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 5021d83b5..0a781fcfc 100644 --- a/build/sdk.atree +++ b/build/sdk.atree @@ -79,6 +79,7 @@ development/sdk/build_tools_runtime.properties build-tools/${PLATFORM_NAME}/runt # 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 d107d3712..dadb77313 100644 --- a/build/tools/windows_sdk.mk +++ b/build/tools/windows_sdk.mk @@ -41,6 +41,7 @@ WIN_TARGETS := \ prebuilt \ sqlite3 \ zipalign \ + split-select \ $(WIN_SDK_TARGETS) # This is the list of *Linux* build tools that we need diff --git a/sdk/platform_source.prop_template b/sdk/platform_source.prop_template index 9c4705c8d..da04c30dd 100644 --- a/sdk/platform_source.prop_template +++ b/sdk/platform_source.prop_template @@ -1,10 +1,10 @@ Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION} Pkg.UserSrc=false Platform.Version=${PLATFORM_VERSION} -Platform.CodeName=L +Platform.CodeName=LOLLIPOP Pkg.Revision=1 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION} AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME} Layoutlib.Api=12 -Layoutlib.Revision=1 +Layoutlib.Revision=2 Platform.MinToolsRev=22 diff --git a/sdk/sdk_files_NOTICE.txt b/sdk/sdk_files_NOTICE.txt index bb72a3464..2b3d8b57c 100644 --- a/sdk/sdk_files_NOTICE.txt +++ b/sdk/sdk_files_NOTICE.txt @@ -9740,6 +9740,7 @@ Notices for file(s): /bin/dexdump /bin/dx /bin/jasmin +/bin/split-select /framework/android-mock-generatorlib.jar /framework/jasmin.jar /lib/lib64cutils.a |