diff options
| author | Joe Onorato <joeo@android.com> | 2010-07-15 11:08:39 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-07-15 11:08:39 -0700 |
| commit | 562124e84d8ae63b614b14ba257680571091ef1f (patch) | |
| tree | 61167513f1034b1069ddaf4f311f997f40a5ec90 | |
| parent | 3a053db28451858162f3dd84f18fae2f245b07f1 (diff) | |
| parent | 80a60ba85b5c2ed40e8685a16ce6d3ed31ef0929 (diff) | |
| download | frameworks_base-562124e84d8ae63b614b14ba257680571091ef1f.zip frameworks_base-562124e84d8ae63b614b14ba257680571091ef1f.tar.gz frameworks_base-562124e84d8ae63b614b14ba257680571091ef1f.tar.bz2 | |
Merge "Clean up some style in the makefiles." into gingerbread
| -rw-r--r-- | Android.mk | 14 | ||||
| -rw-r--r-- | tools/layoutlib/Android.mk | 8 |
2 files changed, 12 insertions, 10 deletions
@@ -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 \ diff --git a/tools/layoutlib/Android.mk b/tools/layoutlib/Android.mk index 6d606a9..135a633 100644 --- a/tools/layoutlib/Android.mk +++ b/tools/layoutlib/Android.mk @@ -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) # |