Loading Android.mk +3 −6 Original line number Diff line number Diff line Loading @@ -22,11 +22,11 @@ include $(CLEAR_VARS) LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/src/java LOCAL_SRC_FILES := $(call all-java-files-under, src/java) \ $(call all-Iaidl-files-under, src/java) \ $(call all-logtags-files-under, src/java) \ $(call all-proto-files-under, proto) $(call all-logtags-files-under, src/java) LOCAL_JAVA_LIBRARIES := voip-common ims-common services bouncycastle LOCAL_STATIC_JAVA_LIBRARIES := \ telephony-protos \ android.hardware.radio-V1.0-java \ android.hardware.radio-V1.1-java \ android.hardware.radio-V1.2-java \ Loading @@ -36,11 +36,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_MODULE_TAGS := optional LOCAL_MODULE := telephony-common LOCAL_PROTOC_OPTIMIZE_TYPE := nano LOCAL_PROTO_JAVA_OUTPUT_PARAMS := store_unknown_fields=true,enum_style=java LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/jarjar-rules.txt LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk ifeq ($(EMMA_INSTRUMENT_FRAMEWORK),true) LOCAL_EMMA_INSTRUMENT := true Loading proto/Android.bp 0 → 100644 +27 −0 Original line number Diff line number Diff line // Copyright (C) 2018 The Android Open Source Project // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. java_library_static { name: "telephony-protos", proto: { type: "nano", output_params: [ "store_unknown_fields=true", "enum_style=java", ], }, srcs: ["src/**/*.proto"], no_framework_libs: true, jarjar_rules: "jarjar-rules.txt", } No newline at end of file jarjar-rules.txt→proto/jarjar-rules.txt +0 −0 File moved. View file proto/carrierId.proto→proto/src/carrierId.proto +0 −0 File moved. View file proto/telephony.proto→proto/src/telephony.proto +0 −0 File moved. View file Loading
Android.mk +3 −6 Original line number Diff line number Diff line Loading @@ -22,11 +22,11 @@ include $(CLEAR_VARS) LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/src/java LOCAL_SRC_FILES := $(call all-java-files-under, src/java) \ $(call all-Iaidl-files-under, src/java) \ $(call all-logtags-files-under, src/java) \ $(call all-proto-files-under, proto) $(call all-logtags-files-under, src/java) LOCAL_JAVA_LIBRARIES := voip-common ims-common services bouncycastle LOCAL_STATIC_JAVA_LIBRARIES := \ telephony-protos \ android.hardware.radio-V1.0-java \ android.hardware.radio-V1.1-java \ android.hardware.radio-V1.2-java \ Loading @@ -36,11 +36,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_MODULE_TAGS := optional LOCAL_MODULE := telephony-common LOCAL_PROTOC_OPTIMIZE_TYPE := nano LOCAL_PROTO_JAVA_OUTPUT_PARAMS := store_unknown_fields=true,enum_style=java LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/jarjar-rules.txt LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk ifeq ($(EMMA_INSTRUMENT_FRAMEWORK),true) LOCAL_EMMA_INSTRUMENT := true Loading
proto/Android.bp 0 → 100644 +27 −0 Original line number Diff line number Diff line // Copyright (C) 2018 The Android Open Source Project // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. java_library_static { name: "telephony-protos", proto: { type: "nano", output_params: [ "store_unknown_fields=true", "enum_style=java", ], }, srcs: ["src/**/*.proto"], no_framework_libs: true, jarjar_rules: "jarjar-rules.txt", } No newline at end of file