diff options
| author | 2009-11-18 17:23:19 -0800 | |
|---|---|---|
| committer | 2009-11-18 17:23:19 -0800 | |
| commit | bccac13afaa2afc528e548dffe9a886aa5f63791 (patch) | |
| tree | 92ac8bea77e5e8245e1f963b4a45e236575ab178 | |
| parent | 522c0407bd313f87ded07373efeb30cb7cf7e343 (diff) | |
| parent | a2d89234c16ac0951260f2b2a35b4ef90cc9e255 (diff) | |
Merge change I3a62e1c2 into eclair-mr2
* changes:
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).
| -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 8249a31302..349bb86751 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 2eab3e1089..2eab3e1089 100644 --- a/common/src/com/android/common/Patterns.java +++ b/common/java/com/android/common/Patterns.java |