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

Merge change I3a62e1c2 into eclair-mr2

Browse Source 
* 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).
This commit is contained in:
Android (Google) Code Review
2009-11-18 17:23:19 -08:00
parent 9d6704f9f1 cc342e3365
commit b99c469e2b
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_NO_STANDARD_LIBRARIES := true
LOCAL_JAVA_LIBRARIES := core ext LOCAL_JAVA_LIBRARIES := core ext
LOCAL_STATIC_JAVA_LIBRARIES := android-common
LOCAL_MODULE := framework LOCAL_MODULE := framework
LOCAL_MODULE_CLASS := JAVA_LIBRARIES LOCAL_MODULE_CLASS := JAVA_LIBRARIES

7
common/Android.mk
View File

@@ -14,11 +14,12 @@
LOCAL_PATH := $(call my-dir) 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) include $(CLEAR_VARS)
LOCAL_MODULE := android-common LOCAL_MODULE := android-common
LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_SRC_FILES := $(call all-java-files-under, java)
LOCAL_JAVA_LIBRARIES := core ext
LOCAL_SRC_FILES := $(call all-java-files-under, src)
include $(BUILD_STATIC_JAVA_LIBRARY) include $(BUILD_STATIC_JAVA_LIBRARY)
# Include this library in the build server's output directory # 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