Commit Graph

11 Commits

Author SHA1 Message Date
Hai Zhang
e247dbe5fe Remove service-permission-streaming-proto-sources from platform.
Fixes: 246812597
Test: build
Change-Id: Ide9ff8a3b6009df33418e46aebd75d66be4907e4
2022-09-14 19:57:29 +00:00
Aaron Huang
93239bf038 Remove framework-connectivity-proto from platform
In the generated javastream and cppsteam incident proto file,
it defines the start position for netstats at 3001 and it doesn't
actually use the NetworkStatsServiceDumpProto which is deinfed in
netstats.proto.
Thus, the framework-connectivity-proto can be removed from
framework-javastream-protos and framework-cppstream-protos.

The generated incident proto file defines netstats as the following,

    // optional .android.service.NetworkStatsServiceDumpProto netstats = 3001;
    public static final long NETSTATS = 0x0000010b00000bb9L;

Furthermore, on Android side, this is not strictly proto dependency,
and there's no one using this section, so it can be removed and mark
it as reserved.

Bug: 222625935
Test: FrameworksNetTests
      atest CtsIncidentHostTestCases:IncidentdTest
      adb shell dumpsys netstats
Change-Id: I3083a43a2f9c20768264ce2a531e0a0593f31697
2022-08-19 16:15:05 +08:00
Vinh Tran
1bf20c044a Merge "Remove uses of depfile in gensrcs modules" am: 892f6a9314 am: 8bfca500e7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2125692

Change-Id: I2898de97e235807179598761c4497883dd6b29ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 18:39:27 +00:00
Vinh Tran
61e69fabe1 Remove uses of depfile in gensrcs modules
The depfile concept in Soong and Ninja isn't applicable in Bazel because Bazel requires listing the deps explicitly.

This CL removes the uses of depfile property and explictly declare the implicit deps in tool_files. The motivation behind this change is to eventually deprecate depfile (aosp/2120835) in gensrcs to ensure all gensrcs modules are convertable to Bazel.

Test: CI
Test: m framework-cppstream-protos && m framework-javastream-protos
Bug: 179452413
Change-Id: Iec6b61b4194d3f1e728449ee63b879818d9c958a
2022-06-15 11:27:46 -04:00
Aaron Huang
623fe199f7 Fix proto invalid write type
While dumpProtoLocked is called, InvalidProtocolBufferException
occurred because types are mismatched between platform side and
module side.

netstats.proto was moved into connectivity module, both the
platform(incident.proto) and the module uses protoc-gen-javastream
to generate the Java classes from it. It should be fine since
platform includes the source of the proto, and jarjar the generated
classess in the module to avoid conflict with platform.

Bug: 218566849
Test: adb shell incident 3001
      adb shell dumpsys netstats --proto
      atest CtsIncidentHostTestCases:IncidentdTest#testIncidentReportDumpAuto
Change-Id: I4654350a59dc1ca1a925785ad37f34aa7b481235
Merged-In: I4654350a59dc1ca1a925785ad37f34aa7b481235
2022-03-07 08:44:25 +00:00
Tyler Dewey
4c5d89e69d Update build target names & code location for roleservice.proto usages
in framework.

Bug: 217406624
Test: built and flashed
Change-Id: Ibcb924df059af5d518b7f6f80487a3fb57bd6623
2022-03-07 05:48:42 +00:00
Aaron Huang
d87c9cb26b Fix proto invalid write type
While dumpProtoLocked is called, InvalidProtocolBufferException
occurred because types are mismatched between platform side and
module side.

netstats.proto was moved into connectivity module, both the
platform(incident.proto) and the module uses protoc-gen-javastream
to generate the Java classes from it. It should be fine since
platform includes the source of the proto, and jarjar the generated
classess in the module to avoid conflict with platform.

Bug: 218566849
Test: adb shell incident 3001
      adb shell dumpsys netstats --proto
      atest CtsIncidentHostTestCases:IncidentdTest#testIncidentReportDumpAuto
Change-Id: I4654350a59dc1ca1a925785ad37f34aa7b481235
Merged-In: I4654350a59dc1ca1a925785ad37f34aa7b481235
2022-03-04 06:39:30 +00:00
Cole Faust
2fd661b283 Use enabled: false to disable errorprone
Enabled: false is more performant than -XepDisableAllChecks,
as normally the module is built twice, once with and once
without errorprone. Enabled: false will entirely remove
the second build.

Bug: 190944875
Bug: 72714520
Change-Id: Ie393f41a33e59dc4fd36b98ca2fd87f53c0f9785
Test: Presumbits
2021-06-19 00:54:35 +00:00
Dichen Zhang
3e5dae9da2 enum migration
Move proto messages out of enum/ directory.

Test: make
Bug: b/184754707
Change-Id: Ia240c2608227c34d8caa0fa89d62a00bf2bb6908
Merged-In: Ia240c2608227c34d8caa0fa89d62a00bf2bb6908
2021-04-14 22:48:32 +00:00
Dichen Zhang
c2ae00b80d enum migration
Move proto messages out of enum/ directory.

Test: make
Bug: b/184754707
Change-Id: Ia240c2608227c34d8caa0fa89d62a00bf2bb6908
2021-04-13 15:24:22 -07:00
Anton Hansson
31fb58bd22 Move framework proto build rules to separate file
The proto build rules are quite large and makes the top-level Android.bp
file difficult to navigate. Move them to a separate file.

Bug: 185128417
Test: m
Change-Id: I5719ba0fa8e03dcfca0cc32dc30db3f87ea4e3cd
2021-04-12 18:39:20 +01:00