diff options
| -rw-r--r-- | Android.bp | 13 | ||||
| -rw-r--r-- | Android.mk | 29 |
2 files changed, 13 insertions, 29 deletions
diff --git a/Android.bp b/Android.bp index 02e4785a1227..e404cd0372ec 100644 --- a/Android.bp +++ b/Android.bp @@ -12,6 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. +// Build ext.jar +// ============================================================ +java_library { + name: "ext", + no_framework_libs: true, + static_libs: [ + "libphonenumber-platform", + "nist-sip", + "tagsoup", + ], + dxflags: ["--core-library"], +} + // ==== c++ proto device library ============================== cc_library { name: "libplatformprotos", diff --git a/Android.mk b/Android.mk index 28faf84ff4e7..53d7f262ee0a 100644 --- a/Android.mk +++ b/Android.mk @@ -1489,35 +1489,6 @@ LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk include $(BUILD_DROIDDOC) -# Build ext.jar -# ============================================================ - -ext_dirs := \ - ../../external/nist-sip/java \ - ../../external/tagsoup/src \ - -ext_src_files := $(call all-java-files-under,$(ext_dirs)) - -# ==== the library ========================================= -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(ext_src_files) - -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := core-oj core-libart -LOCAL_STATIC_JAVA_LIBRARIES := libphonenumber-platform -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE := ext - -LOCAL_DX_FLAGS := --core-library - -ifneq ($(INCREMENTAL_BUILDS),) - LOCAL_PROGUARD_ENABLED := disabled - LOCAL_JACK_ENABLED := incremental -endif - -include $(BUILD_JAVA_LIBRARY) - # ==== java proto host library ============================== include $(CLEAR_VARS) LOCAL_MODULE := platformprotos |