Commit Graph

4 Commits

Author SHA1 Message Date
Chiachang Wang
c6610acf82 Fix build warnings for CaptivePortalLogin
CaptivePortalLogin needs only the defintion in
metrics_constants.proto. This will not need the jarjar_rules.
Thus, remove the unnecessary rule to fix the build warning.

Test: make CaptivePortalLogin and no warning
Bug: 123717273
Change-Id: I5bb3ee61be769989d02a2762a7747d4dafd7bd71
2019-02-21 14:00:59 +08:00
Remi NGUYEN VAN
47274275cf Prepare CaptivePortalLogin for system_current
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
2019-01-31 18:14:54 +09:00
Tobias Thierer
d65595a94e Pin jarjar targets to java_version 1.8.
This CL pins the following make targets to java_version 1.8,
which is currently the default:
  framework-protos
  repackaged.android.test.base
  repackaged.android.test.mock
  repackaged.android.test.runner

For consistency, their dependencies,
  android.test.base
  android.test.mock
  android.test.runner
which contain .java source files, are also pinned to 1.8.

This is so that the two steps:
 a) update jarjar to support v53 class files
 b) support -target 1.9 in the rest of the toolchain
can be completed in any order, in future CLs. Before this CL,
they would have needed to be completed in order a), b).

Bug: 72703434
Test: EXPERIMENTAL_USE_OPENJDK9=true USE_R8=true make checkbuild docs
      (in a client where CL http://r.android.com/596874 was reverted)

Change-Id: If78067294ae7ab78997aa109b0e08be427bdf0b8
2018-02-05 21:14:24 +00:00
Colin Cross
747e7c15d8 Convert framework-protos to Android.bp
See build/soong/README.md for more information.

Test: m checkbuild
Change-Id: Id7992ff0cc5d631b64c1fa8e82e8a130ea508236
2017-10-24 17:48:49 -07:00