diff options
| author | Ying Wang <wangying@google.com> | 2010-09-28 17:27:56 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2010-09-28 17:27:56 -0700 |
| commit | 912f8286056586da76f1dd03ccfca2990ea5d258 (patch) | |
| tree | 03c5b32aeeb0e5fe1bbe2b707f5f1dd1c7af9379 | |
| parent | e1926260486707b3941b5488e97307f7904d1c99 (diff) | |
| download | build-912f8286056586da76f1dd03ccfca2990ea5d258.zip build-912f8286056586da76f1dd03ccfca2990ea5d258.tar.gz build-912f8286056586da76f1dd03ccfca2990ea5d258.tar.bz2 | |
framework-res is not used as regular Java library now.
Change-Id: Ic2b8f7d7bceab3be7884eb4a7dbe721c14bd1ccb
| -rw-r--r-- | core/definitions.mk | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/core/definitions.mk b/core/definitions.mk index 09ab96a..26ed215 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -473,8 +473,7 @@ endef ########################################################### -## Convert "framework framework-res ext" to "out/.../javalib.jar ..." -## This lets us treat framework-res as a normal library. +## Convert "core ext framework" to "out/.../javalib.jar ..." ## $(1): library list ## $(2): Non-empty if IS_HOST_MODULE ########################################################### @@ -483,18 +482,13 @@ endef # $(2): Non-empty if IS_HOST_MODULE define _java-lib-dir $(call intermediates-dir-for, \ - $(if $(filter framework-res,$(1)),APPS,JAVA_LIBRARIES),$(1),$(2)) -endef - -# $(1): library name -define _java-lib-classes.jar -$(if $(filter framework-res,$(1)),package$(COMMON_ANDROID_PACKAGE_SUFFIX),classes$(COMMON_JAVA_PACKAGE_SUFFIX)) + JAVA_LIBRARIES,$(1),$(2),COMMON) endef # $(1): library name # $(2): Non-empty if IS_HOST_MODULE define _java-lib-full-classes.jar -$(call _java-lib-dir,$(1),$(2))/$(call _java-lib-classes.jar,$(1)) +$(call _java-lib-dir,$(1),$(2))/classes$(COMMON_JAVA_PACKAGE_SUFFIX) endef # $(1): library name list @@ -504,14 +498,9 @@ $(foreach lib,$(1),$(call _java-lib-full-classes.jar,$(lib),$(2))) endef # $(1): library name -define _java-lib-dep -$(if $(filter framework-res,$(1)),package$(COMMON_ANDROID_PACKAGE_SUFFIX),javalib$(COMMON_JAVA_PACKAGE_SUFFIX)) -endef - -# $(1): library name # $(2): Non-empty if IS_HOST_MODULE define _java-lib-full-dep -$(call _java-lib-dir,$(1),$(2))/$(call _java-lib-dep,$(1)) +$(call _java-lib-dir,$(1),$(2))/javalib$(COMMON_JAVA_PACKAGE_SUFFIX) endef # $(1): library name list |