Extract telephony-protos target.
After this CL, the protos that were formerly part of telephony-common
are now a separate build target. This allows telephony-protos to be
pinned to a particular java_version (in a follow-up CL), and more
generally separates the proto-related from not proto-related build
configuration.
Bug: 72703434
Test: Treehugger
Change-Id: I1c1d95e24f584b73e5fe64ca6251fa7b153fba0b
diff --git a/Android.mk b/Android.mk
index 7df2019..561aed0 100644
--- a/Android.mk
+++ b/Android.mk
@@ -22,11 +22,11 @@
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 \
@@ -36,11 +36,8 @@
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
diff --git a/proto/Android.bp b/proto/Android.bp
new file mode 100644
index 0000000..8e24b50
--- /dev/null
+++ b/proto/Android.bp
@@ -0,0 +1,27 @@
+// 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
diff --git a/jarjar-rules.txt b/proto/jarjar-rules.txt
similarity index 100%
rename from jarjar-rules.txt
rename to proto/jarjar-rules.txt
diff --git a/proto/carrierId.proto b/proto/src/carrierId.proto
similarity index 100%
rename from proto/carrierId.proto
rename to proto/src/carrierId.proto
diff --git a/proto/telephony.proto b/proto/src/telephony.proto
similarity index 100%
rename from proto/telephony.proto
rename to proto/src/telephony.proto