diff options
| author | Josh Guilfoyle <Josh.Guilfoyle@T-Mobile.com> | 2010-12-23 14:30:28 -0800 |
|---|---|---|
| committer | Josh Guilfoyle <Josh.Guilfoyle@T-Mobile.com> | 2010-12-23 22:33:16 -0800 |
| commit | ce9c0447f946d8fe20d020f01b6548c815579848 (patch) | |
| tree | 27f4eac06f8960e31f9dfb670f4e67f11029e486 /tools/layoutlib/Android.mk | |
| parent | 0e7ab2f533037698b4ab4255828fa2e08f90566f (diff) | |
| parent | 6bcc7a7e5fc5a2340c4f060141bec9d181454807 (diff) | |
| download | frameworks_base-ce9c0447f946d8fe20d020f01b6548c815579848.zip frameworks_base-ce9c0447f946d8fe20d020f01b6548c815579848.tar.gz frameworks_base-ce9c0447f946d8fe20d020f01b6548c815579848.tar.bz2 | |
Merge commit 'android-2.3.1_r1' into themes-exp-2.3.1_r1
Conflicts:
core/java/android/app/ActivityThread.java
core/java/android/content/pm/ApplicationInfo.java
core/java/android/content/pm/PackageParser.java
core/res/AndroidManifest.xml
services/java/com/android/server/PackageManagerService.java
services/java/com/android/server/SystemServer.java
test-runner/src/android/test/mock/MockPackageManager.java
Diffstat (limited to 'tools/layoutlib/Android.mk')
| -rw-r--r-- | tools/layoutlib/Android.mk | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/tools/layoutlib/Android.mk b/tools/layoutlib/Android.mk index 6d606a9..b27ce0e 100644 --- a/tools/layoutlib/Android.mk +++ b/tools/layoutlib/Android.mk @@ -25,15 +25,11 @@ include $(CLEAR_VARS) # We need to process the framework classes.jar file, but we can't # depend directly on it (private vars won't be inherited correctly). # So, we depend on framework's BUILT file. -built_framework_dep := \ - $(call intermediates-dir-for,JAVA_LIBRARIES,framework)/javalib.jar -built_framework_classes := \ - $(call intermediates-dir-for,JAVA_LIBRARIES,framework)/classes.jar +built_framework_dep := $(call java-lib-deps,framework) +built_framework_classes := $(call java-lib-files,framework) -built_core_dep := \ - $(call intermediates-dir-for,JAVA_LIBRARIES,core)/javalib.jar -built_core_classes := \ - $(call intermediates-dir-for,JAVA_LIBRARIES,core)/classes.jar +built_core_dep := $(call java-lib-deps,core) +built_core_classes := $(call java-lib-files,core) built_layoutlib_create_jar := $(call intermediates-dir-for, \ JAVA_LIBRARIES,layoutlib_create,HOST)/javalib.jar @@ -52,13 +48,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) # |