Merge "Convert ext.jar to Android.bp" am: 42156f3e56 (faededa6) · Commits · e / os / android_frameworks_base

Android.bp

+13 −0

Original line number	Original line	Diff line number	Diff line
	@@ -12,6 +12,19 @@
	// See the License for the specific language governing permissions and		// See the License for the specific language governing permissions and
	// limitations under the License.		// 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 ==============================		// ==== c++ proto device library ==============================
	cc_library {		cc_library {
	name: "libplatformprotos",		name: "libplatformprotos",

+0 −29

Original line number	Original line	Diff line number	Diff line
	@@ -1466,35 +1466,6 @@ LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk

	include $(BUILD_DROIDDOC)		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 ==============================		# ==== java proto host library ==============================
	include $(CLEAR_VARS)		include $(CLEAR_VARS)
	LOCAL_MODULE := platformprotos		LOCAL_MODULE := platformprotos