Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 562124e8: Merge "Clean up some style in the makefiles." into gingerbread

Browse Source 
Merge commit '562124e84d8ae63b614b14ba257680571091ef1f' into gingerbread-plus-aosp

* commit '562124e84d8ae63b614b14ba257680571091ef1f':
  Clean up some style in the makefiles.
This commit is contained in:
Joe Onorato
2010-07-15 11:12:57 -07:00
committed by Android Git Automerger
parent a6be4e01b2 562124e84d
commit 92a47ea3a7
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Android.mk
View File

@@ -24,7 +24,7 @@ LOCAL_PATH := $(call my-dir)
# Instead, it depends on the R.stamp file, which lists the corresponding
# R.java file as a prerequisite.
# TODO: find a more appropriate way to do this.
framework-res-source-path := APPS/framework-res_intermediates/src
framework_res_source_path := APPS/framework-res_intermediates/src
# the library
# ============================================================
@@ -189,9 +189,9 @@ LOCAL_SRC_FILES += \
LOCAL_AIDL_INCLUDES += $(FRAMEWORKS_BASE_JAVA_SRC_DIRS)
LOCAL_INTERMEDIATE_SOURCES := \
$(framework-res-source-path)/android/R.java \
$(framework-res-source-path)/android/Manifest.java \
$(framework-res-source-path)/com/android/internal/R.java
$(framework_res_source_path)/android/R.java \
$(framework_res_source_path)/android/Manifest.java \
$(framework_res_source_path)/com/android/internal/R.java
LOCAL_NO_STANDARD_LIBRARIES := true
LOCAL_JAVA_LIBRARIES := core ext
@@ -357,9 +357,9 @@ framework_docs_LOCAL_DROIDDOC_SOURCE_PATH := \
$(FRAMEWORKS_BASE_JAVA_SRC_DIRS)
framework_docs_LOCAL_INTERMEDIATE_SOURCES := \
$(framework-res-source-path)/android/R.java \
$(framework-res-source-path)/android/Manifest.java \
$(framework-res-source-path)/com/android/internal/R.java
$(framework_res_source_path)/android/R.java \
$(framework_res_source_path)/android/Manifest.java \
$(framework_res_source_path)/com/android/internal/R.java
framework_docs_LOCAL_JAVA_LIBRARIES := \
core \

8
tools/layoutlib/Android.mk
View File

@@ -52,13 +52,15 @@ include $(BUILD_SYSTEM)/base_rules.mk
$(LOCAL_BUILT_MODULE): $(built_core_dep) \
$(built_framework_dep) \
$(built_layoutlib_create_jar)
@echo "host layoutlib_create: $@"
@mkdir -p $(dir $@)
@rm -f $@
$(hide) echo "host layoutlib_create: $@"
$(hide) mkdir -p $(dir $@)
$(hide) rm -f $@
$(hide) ls -l $(built_framework_classes)
$(hide) java -jar $(built_layoutlib_create_jar) \
$@ \
$(built_core_classes) \
$(built_framework_classes)
$(hide) ls -l $(built_framework_classes)
#