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

Commit 2e688671 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Convert platformprotosnano and platformprotoslite to Android.bp" am:... 

Merge "Convert platformprotosnano and platformprotoslite to Android.bp" am: c465fef2 am: 2f9f6b00
am: e3eb78dd

Change-Id: I4f0ea8c51aa0dfadcbd93fa9e553aba536594cf3
parents 229474ec e3eb78dd

Android.bp

+34 −0
Original line number Diff line number Diff line
@@ -801,6 +801,40 @@ java_library_host { 
    },

}



// ====  java proto device library (for test only)  ==============================

java_library {

    name: "platformprotosnano",

    proto: {

        type: "nano",

        output_params: ["store_unknown_fields=true"],

        include_dirs: ["external/protobuf/src"],

    },



    sdk_version: "current",

    srcs: [

        "core/proto/**/*.proto",

        "libs/incident/proto/android/os/**/*.proto",

    ],

}



// ====  java proto device library (for test only)  ==============================

java_library {

    name: "platformprotoslite",

    proto: {

        type: "lite",

        include_dirs: ["external/protobuf/src"],

    },



    srcs: [

        "core/proto/**/*.proto",

        "libs/incident/proto/android/os/**/*.proto",

    ],

    // Protos have lots of MissingOverride and similar.

    errorprone: {

        javacflags: ["-XepDisableAllChecks"],

    },

}



// ====  c++ proto device library  ==============================

cc_library {

    name: "libplatformprotos",

Android.mk

+0 −30
Original line number Diff line number Diff line
@@ -321,36 +321,6 @@ $(OUT_DOCS)/offline-sdk-timestamp: $(OUT_DOCS)/offline-sdk-docs-docs.zip 
	$(hide) mkdir -p $(OUT_DOCS)/offline-sdk

	( unzip -qo $< -d $(OUT_DOCS)/offline-sdk && touch -f $@ ) || exit 1



# ====  java proto device library (for test only)  ==============================

include $(CLEAR_VARS)

LOCAL_MODULE := platformprotosnano

LOCAL_MODULE_TAGS := tests

LOCAL_PROTOC_OPTIMIZE_TYPE := nano

LOCAL_PROTOC_FLAGS := \

    -Iexternal/protobuf/src

LOCAL_PROTO_JAVA_OUTPUT_PARAMS := \

    store_unknown_fields = true

LOCAL_SDK_VERSION := current

LOCAL_SRC_FILES := \

    $(call all-proto-files-under, core/proto) \

    $(call all-proto-files-under, libs/incident/proto/android/os)

include $(BUILD_STATIC_JAVA_LIBRARY)





# ====  java proto device library (for test only)  ==============================

include $(CLEAR_VARS)

LOCAL_MODULE := platformprotoslite

LOCAL_MODULE_TAGS := tests

LOCAL_PROTOC_OPTIMIZE_TYPE := lite

LOCAL_PROTOC_FLAGS := \

    -Iexternal/protobuf/src

LOCAL_SRC_FILES := \

    $(call all-proto-files-under, core/proto) \

    $(call all-proto-files-under, libs/incident/proto/android/os)

# Protos have lots of MissingOverride and similar.

LOCAL_ERROR_PRONE_FLAGS := -XepDisableAllChecks

include $(BUILD_STATIC_JAVA_LIBRARY)



# ==== hiddenapi lists =======================================

include $(CLEAR_VARS)