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

Merge "Convert ext.jar to Android.bp" am: 42156f3e56 am: 8feea076a2

Browse Source 
am: faededa6af

Change-Id: I9e640ea1f6175306c74075e25485bce622d6ca52
This commit is contained in:
Colin Cross
2017-10-15 02:43:13 +00:00
committed by android-build-merger
parent ecc8bdc227 faededa6af
commit 3f6bef874e
2 changed files with 13 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Android.bp
View File

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

29
Android.mk
View File

@@ -1489,35 +1489,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