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

Commit d8e02251 authored by Colin Cross's avatar Colin Cross
Browse files

Convert ext.jar to Android.bp 

See build/soong/README.md for more information

Switches to using static libraries for tagsoup and nist-sip to avoid
reference source files in another project.

Test: m -j checkbuild
Change-Id: I5d4c7729196dd78da63bd9d6b43647f6f61006cb
parent d30e47ec

Android.bp

+13 −0
Original line number Diff line number Diff line
@@ -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",

Android.mk

+0 −29
Original line number Diff line number Diff line
@@ -1463,35 +1463,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