Includes small changes to stop using non-SystemApi endpoints. Test: make CaptivePortalLogin Test: flashed, login works, SSL certificate invalid flow works Bug: 112869080 Merged-In: Ic6ce98942959705ea7ef14a7a62d33e3abf7eb72 Change-Id: Ie7ea3bab6aa8629ce4c111adee0c0699d95d4b0e
41 lines
1011 B
Plaintext
41 lines
1011 B
Plaintext
java_library_static {
|
|
name: "framework-protos",
|
|
host_supported: true,
|
|
proto: {
|
|
type: "nano",
|
|
},
|
|
srcs: ["src/**/*.proto"],
|
|
no_framework_libs: true,
|
|
// Pin java_version until jarjar is certified to support later versions. http://b/72703434
|
|
java_version: "1.8",
|
|
target: {
|
|
android: {
|
|
jarjar_rules: "jarjar-rules.txt",
|
|
},
|
|
host: {
|
|
static_libs: ["libprotobuf-java-nano"],
|
|
},
|
|
},
|
|
}
|
|
|
|
java_library_static {
|
|
name: "metrics-constants-protos",
|
|
host_supported: true,
|
|
proto: {
|
|
type: "nano",
|
|
},
|
|
srcs: ["src/metrics_constants.proto"],
|
|
no_framework_libs: true,
|
|
sdk_version: "system_current",
|
|
// Pin java_version until jarjar is certified to support later versions. http://b/72703434
|
|
java_version: "1.8",
|
|
target: {
|
|
android: {
|
|
jarjar_rules: "jarjar-rules.txt",
|
|
},
|
|
host: {
|
|
static_libs: ["libprotobuf-java-nano"],
|
|
},
|
|
},
|
|
}
|