Merge "Add AAPT2 to SDK build" into nyc-dev

build/product_sdk.mk

@@ -28,6 +28,7 @@
 # Host tools and java libraries that are parts of the SDK.
 PRODUCT_PACKAGES += \
 	aapt \
+	aapt2 \
 	adb \
 	aidl \
 	zipalign \

build/sdk.atree

@@ -84,6 +84,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/aapt2                               strip build-tools/${PLATFORM_NAME}/aapt2
 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

build/tools/windows_sdk.mk

@@ -28,7 +28,10 @@ include $(TOPDIR)sdk/build/windows_sdk_tools.mk
 # Windows executables. All the targets specified here are located in
 # the topdir/development directory and are somehow platform-dependent.
 WIN_TARGETS := \
-	aapt adb aidl \
+	aapt \
+	aapt2 \
+	adb \
+	aidl \
 	aprotoc \
 	bcc_compat \
 	clang \