Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am efe67607: am b99c469e: Merge change I3a62e1c2 into eclair-mr2

Browse Source 
Merge commit 'efe676074b55867817c723e8232078810479906c'

* commit 'efe676074b55867817c723e8232078810479906c':
  Solve the mutual interdependency problem between common and framework:
This commit is contained in:
Dan Egnor
2009-11-18 18:02:07 -08:00
committed by Android Git Automerger
parent da21830f47 efe676074b
commit 5a1b8da7df
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Android.mk
View File

@@ -175,7 +175,6 @@ LOCAL_INTERMEDIATE_SOURCES := \
LOCAL_NO_STANDARD_LIBRARIES := true
LOCAL_JAVA_LIBRARIES := core ext
LOCAL_STATIC_JAVA_LIBRARIES := android-common
LOCAL_MODULE := framework
LOCAL_MODULE_CLASS := JAVA_LIBRARIES

7
common/Android.mk
View File

@@ -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

0
common/src/com/android/common/Patterns.java → common/java/com/android/common/Patterns.java
View File