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

Commit d4609af9 authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge "Convert framework-protos to Android.bp"

parents ceb336fc 747e7c15
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ subdirs = [
    "core/*",
    "libs/*",
    "media/*",
    "proto",
    "tools/*",
    "native/android",
    "native/graphics/jni",

proto/Android.bp

0 → 100644
+17 −0
Original line number Diff line number Diff line
java_library_static {
    name: "framework-protos",
    host_supported: true,
    proto: {
        type: "nano",
    },
    srcs: ["src/**/*.proto"],
    no_framework_libs: true,
    target: {
        android: {
            jarjar_rules: "jarjar-rules.txt",
        },
        host: {
            static_libs: ["libprotobuf-java-nano"],
        },
    },
}

proto/Android.mk

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line
LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)

LOCAL_MODULE := framework-protos

LOCAL_PROTOC_OPTIMIZE_TYPE := nano
LOCAL_SRC_FILES:= $(call all-proto-files-under, src)
LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt

LOCAL_NO_STANDARD_LIBRARIES := true
LOCAL_JAVA_LIBRARIES := core-oj core-libart

LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/jarjar-rules.txt

include $(BUILD_STATIC_JAVA_LIBRARY)

# Host-side version of framework-protos
# ============================================================
include $(CLEAR_VARS)

LOCAL_MODULE := host-framework-protos
LOCAL_MODULE_TAGS := optional

LOCAL_PROTOC_OPTIMIZE_TYPE := nano
LOCAL_SRC_FILES:= $(call all-proto-files-under, src)

LOCAL_NO_STANDARD_LIBRARIES := true
LOCAL_STATIC_JAVA_LIBRARIES := host-libprotobuf-java-nano

LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/jarjar-rules.txt

include $(BUILD_HOST_JAVA_LIBRARY)
 No newline at end of file