Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bccac13a authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

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).
parents 522c0407 a2d89234

common/Android.mk

+4 −3
Original line number Diff line number Diff line
@@ -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