diff options
| author | Dan Egnor <egnor@google.com> | 2009-11-18 14:41:14 -0800 |
|---|---|---|
| committer | Dan Egnor <egnor@google.com> | 2009-11-18 15:08:18 -0800 |
| commit | cc342e33655dcb396f96d28732efe8f189c34253 (patch) | |
| tree | 60ad57b7dd60d8d7c62e1e6d43881d810e6652ed /common | |
| parent | b9386ed929b72308cbfc68d2833a13aeda38f431 (diff) | |
| download | frameworks_base-cc342e33655dcb396f96d28732efe8f189c34253.zip frameworks_base-cc342e33655dcb396f96d28732efe8f189c34253.tar.gz frameworks_base-cc342e33655dcb396f96d28732efe8f189c34253.tar.bz2 | |
Solve the mutual interdependency problem between common and framework:
Have framework include the common source files directly when building,
then build common as a static library separately (depending on
framework, like everything else).
Goes with a companion change to build/core/pathmap.mk.
Diffstat (limited to 'common')
| -rw-r--r-- | common/Android.mk | 7 | ||||
| -rw-r--r-- | common/java/com/android/common/Patterns.java (renamed from common/src/com/android/common/Patterns.java) | 0 |
2 files changed, 4 insertions, 3 deletions
diff --git a/common/Android.mk b/common/Android.mk index 8249a31..349bb86 100644 --- a/common/Android.mk +++ b/common/Android.mk @@ -14,11 +14,12 @@ LOCAL_PATH := $(call my-dir) +# Note: the source code is in java/, not src/, because this code is also part of +# the framework library, and build/core/pathmap.mk expects a java/ subdirectory. + include $(CLEAR_VARS) LOCAL_MODULE := android-common -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := core ext -LOCAL_SRC_FILES := $(call all-java-files-under, src) +LOCAL_SRC_FILES := $(call all-java-files-under, java) include $(BUILD_STATIC_JAVA_LIBRARY) # Include this library in the build server's output directory diff --git a/common/src/com/android/common/Patterns.java b/common/java/com/android/common/Patterns.java index 2eab3e1..2eab3e1 100644 --- a/common/src/com/android/common/Patterns.java +++ b/common/java/com/android/common/Patterns.java |