am 0646fdae: Fix SDK build.
* commit '0646fdae6714e651c55b8e1ef33fc54e28ece454':
Fix SDK build.
diff --git a/core/base_rules.mk b/core/base_rules.mk
index d03050b..188c352 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -257,7 +257,11 @@
ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),micro)
$(proto_java_sources_file_stamp): PRIVATE_PROTO_JAVA_OUTPUT_OPTION := --javamicro_out
else
+ ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),nano)
+$(proto_java_sources_file_stamp): PRIVATE_PROTO_JAVA_OUTPUT_OPTION := --javanano_out
+ else
$(proto_java_sources_file_stamp): PRIVATE_PROTO_JAVA_OUTPUT_OPTION := --java_out
+ endif
endif
$(proto_java_sources_file_stamp): PRIVATE_PROTOC_FLAGS := $(LOCAL_PROTOC_FLAGS)
$(proto_java_sources_file_stamp) : $(proto_sources_fullpath) $(PROTOC)
diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index 000ba9e..81a9493 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -118,7 +118,7 @@
LOCAL_RENDERSCRIPT_TARGET_API:=
LOCAL_BUILD_HOST_DEX:=
LOCAL_DEX_PREOPT:= # '',true,false,nostripping
-LOCAL_PROTOC_OPTIMIZE_TYPE:= # lite(default),micro,full
+LOCAL_PROTOC_OPTIMIZE_TYPE:= # lite(default),micro,nano,full
LOCAL_PROTOC_FLAGS:=
LOCAL_NO_CRT:=
LOCAL_PROPRIETARY_MODULE:=
diff --git a/core/java.mk b/core/java.mk
index 7c8c894f..b73bc93 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -52,7 +52,11 @@
ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),micro)
LOCAL_STATIC_JAVA_LIBRARIES += libprotobuf-java-2.3.0-micro
else
+ ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),nano)
+ LOCAL_STATIC_JAVA_LIBRARIES += libprotobuf-java-2.3.0-nano
+ else
LOCAL_STATIC_JAVA_LIBRARIES += libprotobuf-java-2.3.0-lite
+ endif
endif
endif
diff --git a/envsetup.sh b/envsetup.sh
index 61bdc3d..ae2ff93 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -159,7 +159,7 @@
export ANDROID_TOOLCHAIN=$ANDROID_EABI_TOOLCHAIN
export ANDROID_QTOOLS=$T/development/emulator/qtools
- export ANDROID_DEV_SCRIPTS=$T/development/scripts
+ export ANDROID_DEV_SCRIPTS=$T/development/scripts:$T/prebuilts/devtools/tools
export ANDROID_BUILD_PATHS=$(get_build_var ANDROID_BUILD_PATHS):$ANDROID_QTOOLS:$ANDROID_TOOLCHAIN$ARM_EABI_TOOLCHAIN_PATH$CODE_REVIEWS:$ANDROID_DEV_SCRIPTS:
export PATH=$ANDROID_BUILD_PATHS$PATH