am 6445b0c5: resolved conflicts for merge of 2fa17026 to lmp-mr1-ub-dev
* commit '6445b0c53daed35dafaf1d9cefbeabf2385099c2':
Fix android-support-v17-leanback-docs build.
diff --git a/v17/leanback/Android.mk b/v17/leanback/Android.mk
index baf8719..2fcad14 100644
--- a/v17/leanback/Android.mk
+++ b/v17/leanback/Android.mk
@@ -107,13 +107,10 @@
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
LOCAL_MODULE_TAGS := optional
-res.COMMON := $(call intermediates-dir-for,$(LOCAL_MODULE_CLASS),android-support-v17-leanback-res,,COMMON)
-leanback.docs.src_files := $(leanback.docs.src_files) $(call all-java-files-under, ../../../../$(res.COMMON))
-
-intermediates.COMMON := $(call intermediates-dir-for,$(LOCAL_MODULE_CLASS),android-support-v17-leanback,,COMMON)
+gen_res_src_dirs := $(call intermediates-dir-for,JAVA_LIBRARIES,android-support-v17-leanback-res,,COMMON)/src
LOCAL_SRC_FILES := $(leanback.docs.src_files)
-LOCAL_ADDITONAL_JAVA_DIR := $(intermediates.COMMON)/src
+LOCAL_ADDITIONAL_JAVA_DIR := $(gen_res_src_dirs)
LOCAL_SDK_VERSION := 19
LOCAL_IS_HOST_MODULE := false
@@ -164,8 +161,7 @@
# ===========================================================
leanback.docs.src_files :=
leanback.docs.java_libraries :=
-intermediates.COMMON :=
-res.COMMON :=
+gen_res_src_dirs :=
leanback_internal_api_file :=
leanback_stubs_stamp :=
leanback.docs.stubpackages :=