am bb964f00: am 432cd6dd: Merge "Allow LOCAL_RESOURCE_DIR pointing to dir generated...

* commit 'bb964f00403a23d2f1ec3313f7b579a9e7f0f12a':
  Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build

diff --cc core/package_internal.mk
Simple merge

diff --cc core/static_java_library.mk
index f31ccd8,79b7292..8e6029d
--- 1/core/static_java_library.mk
--- 2/core/static_java_library.mk
+++ b/core/static_java_library.mk
@@@ -63,10 -64,17 +64,10 @@@ all_res_assets := $(all_resources
  
  include $(BUILD_SYSTEM)/java_library.mk
  
- ifneq (,$(all_resources))
+ ifeq (true,$(need_compile_res))
  R_file_stamp := $(LOCAL_INTERMEDIATE_SOURCE_DIR)/R.stamp
  
 -ifeq ($(strip $(LOCAL_MANIFEST_FILE)),)
 -  LOCAL_MANIFEST_FILE := AndroidManifest.xml
 -endif
 -ifdef LOCAL_FULL_MANIFEST_FILE
 -  full_android_manifest := $(LOCAL_FULL_MANIFEST_FILE)
 -else
 -  full_android_manifest := $(LOCAL_PATH)/$(LOCAL_MANIFEST_FILE)
 -endif
 +include $(BUILD_SYSTEM)/android_manifest.mk
  
  LOCAL_SDK_RES_VERSION:=$(strip $(LOCAL_SDK_RES_VERSION))
  ifeq ($(LOCAL_SDK_RES_VERSION),)