Commit Graph

3850 Commits

Author SHA1 Message Date
Colin Cross
e7a71fa844 Merge "Reduce legacy_core_platform_api_usage.go" 2021-01-13 00:10:34 +00:00
Colin Cross
5cf56302e5 Reduce legacy_core_platform_api_usage.go
Rerun the tools in ag/12184151 to remove unnecessary entries
from legacy_core_platform_api_usage.go.

Test: m checkbuild
Change-Id: I7467ce97fbd863371f5a732c34e647c660fca184
2021-01-11 18:11:47 -08:00
Ulyana Trafimovich
e66d78339b Merge "Remove obsolete class loader context API and update unit tests." am: 53230fefa3 am: 9f19d6b988 am: e2edc31bb9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1538885

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If8884f380bea51c59ad03cfe808c089e92303276
2021-01-08 17:55:11 +00:00
Ulyana Trafimovich
e2edc31bb9 Merge "Remove obsolete class loader context API and update unit tests." am: 53230fefa3 am: 9f19d6b988
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1538885

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8f0c9c8566829fb6a6788846919ff47d43f2c3b7
2021-01-08 17:38:41 +00:00
Ulyana Trafimovich
53230fefa3 Merge "Remove obsolete class loader context API and update unit tests." 2021-01-08 17:00:56 +00:00
Bob Badour
ed04b47876 Merge changes from topic "revert-1541855-revert-1377717-metalics-BOEMJWNSHV-PBOZXBJQZD" am: ddac9bf3f2 am: adf19116d3 am: 72deb7feda
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1540840

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5799dc9b0af0a0f2f36413ed69341dc318cf96ed
2021-01-07 23:48:20 +00:00
Bob Badour
72deb7feda Merge changes from topic "revert-1541855-revert-1377717-metalics-BOEMJWNSHV-PBOZXBJQZD" am: ddac9bf3f2 am: adf19116d3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1540840

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I17c75654bf575e5ebdee04fdbb48932c151088c0
2021-01-07 23:21:14 +00:00
Bob Badour
ddac9bf3f2 Merge changes from topic "revert-1541855-revert-1377717-metalics-BOEMJWNSHV-PBOZXBJQZD"
* changes:
  Revert^2 "Define the standard license_kind rules."
  Revert^2 "Export soong license data to make."
  Revert^2 "Add ability to declare licenses in soong."
2021-01-07 22:42:08 +00:00
Bob Badour
b499922acc Revert^2 "Export soong license data to make."
61a55a0344

Change-Id: I5fb017c683df18bad42a8e27fb2d7c7c510514e5
2021-01-06 20:49:11 -08:00
Jooyung Han
a2861d19f5 Merge "Add "aidl.flags:" property for cc_/java_ modules" am: 26ab0f1051 am: 076ed3bca3 am: fccf62ed45
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1538625

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7842f59026d63a2aab8efe354cc37f20ee9e39ab
2021-01-07 03:16:17 +00:00
Jooyung Han
fccf62ed45 Merge "Add "aidl.flags:" property for cc_/java_ modules" am: 26ab0f1051 am: 076ed3bca3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1538625

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I040864a9f24805fc9d3f8ad426e72566be1fb7eb
2021-01-07 02:25:31 +00:00
Jooyung Han
26ab0f1051 Merge "Add "aidl.flags:" property for cc_/java_ modules" 2021-01-07 01:28:47 +00:00
Bob Badour
a163fe55f9 Merge changes from topic "revert-1377717-metalics-BOEMJWNSHV" am: a1b87c81ca am: 72b5c0288a am: 15ef54bab8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1541852

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I917681ef203a9974b958ef1086f4e8e161cb7baa
2021-01-06 20:22:46 +00:00
Bob Badour
15ef54bab8 Merge changes from topic "revert-1377717-metalics-BOEMJWNSHV" am: a1b87c81ca am: 72b5c0288a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1541852

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie75ae43eb4e19104a2d7702819de6ab57a97bf5b
2021-01-06 20:01:12 +00:00
Bob Badour
5293a09d57 Export soong license data to make. am: 74fab31712 am: de77ecd56b am: 0b061c969c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1454916

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6decb1f33ea120a79a8de2c5b26dd4d87db627d3
2021-01-06 19:54:08 +00:00
Bob Badour
a1b87c81ca Merge changes from topic "revert-1377717-metalics-BOEMJWNSHV"
* changes:
  Revert "Add ability to declare licenses in soong."
  Revert "Export soong license data to make."
  Revert "Define the standard license_kind rules."
2021-01-06 19:17:45 +00:00
Bob Badour
0b061c969c Export soong license data to make. am: 74fab31712 am: de77ecd56b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1454916

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d9075f4d60f9c94b18345cb67e800f10af1e338
2021-01-06 19:12:13 +00:00
Jerome Gaillard
61a55a0344 Revert "Export soong license data to make."
Revert submission 1377717-metalics

Reason for revert: This has broken renderscript_mac target for aosp-master, see b/176909442

Reverted Changes:
I26ac54ca9:Define the standard license_kind rules.
I656486070:Export soong license data to make.
If9d661dfc:Export soong license data to make.
I97943de53:Add ability to declare licenses in soong.
Icaff40171:Rough-in license metadata support to make.
Ib8e538bd0:Add variables for notice deps, license kinds etc.

Change-Id: I51799c94a274eadab414abd80a07b5cda4584be9
2021-01-06 19:00:05 +00:00
Bob Badour
de77ecd56b Export soong license data to make. am: 74fab31712
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1454916

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ied2ab6fb4455326b4e0f1f58fba8d637a2a8f3c9
2021-01-06 18:42:30 +00:00
Bob Badour
659f11fcfc Merge changes from topic "metalics"
* changes:
  Define the standard license_kind rules.
  Export soong license data to make.
  Add ability to declare licenses in soong.
2021-01-06 18:08:07 +00:00
TreeHugger Robot
c154901324 Merge "Revert "Enforce <uses-library> checks for android_app and android_app_import."" into rvc-qpr-dev-plus-aosp am: f1f47a341b
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/13287340

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I809e76224b019edf346b335f9ef8814592002308
2021-01-06 17:15:03 +00:00
Ulyana Trafimovich
c2b6b65d73 Revert "Enforce <uses-library> checks for android_app and android_app_import."
This reverts commit 22890c466e.

Reason for revert: Broken build 7065627 on git_rvc-qpr-dev-plus-aosp
  on aosp_sunfish-userdebug branch.

Bug: 176892941
Test: treehugger
Change-Id: I0f5da13644fd2ec7b0472fe82918e3c6a72d953c
2021-01-06 15:30:09 +00:00
Ulyana Trafimovich
dd1807bb60 Merge "Enforce <uses-library> checks for android_app and android_app_import." am: 0a984f559f am: 5e5db14cc3 am: 35efc7221d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1535007

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I071cc685c59e5c58f9efd3fbfbc42900056cb4f4
2021-01-06 14:32:51 +00:00
Bob Badour
74fab31712 Export soong license data to make.
See: http://go/android-license-checking-in-soong-v2-design

Bug: 151953481
Bug: 151177513
Bug: 67772237

Change-Id: If9d661dfcaa732c459d38d8ad7ec4a0e540846b8
2021-01-05 08:42:48 -08:00
Ulya Trafimovich
7bc1cf508f Remove obsolete class loader context API and update unit tests.
The removed API has been unused since https://r.android.com/1533342
(except for unit tests).

Changes in the unit tests reflect the change of API in
https://r.android.com/1533342: early errors caused by unknown library
paths at CLC construction time have been replaced with late errors at
the time of CLC validation.

Bug: 132357300
Test: m nothing
Change-Id: I739c7c41b6f882b7e28cdd6acd05961d754d8687
2021-01-05 15:41:55 +00:00
Ulya Trafimovich
22890c466e Enforce <uses-library> checks for android_app and android_app_import.
Bug: 132357300
Test: lunch aosp_cf_x86_phone-userdebug && m
Change-Id: Ib9653aa27a173f0f0c03c7c9b0963d8ea71bb155
2021-01-05 12:04:17 +00:00
Anton Hansson
2729ae87c5 Remove Ignore_missing_latest_api am: e6056153cf am: a14b27e1f6 am: 6d906c4f39
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1538883

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1e07de0a6dae26d377fb93cd4778cd50aeeafda1
2021-01-05 10:54:36 +00:00
Jooyung Han
e197d8b174 Add "aidl.flags:" property for cc_/java_ modules
The property can be used to pass additional flags to the AIDL compiler.
For example,

  cc_library {
    ..
    srcs: ["Foo.aidl"],
    aidl: {
      flags: [
        "-Werror",      // warnings as error
        "-Weverything", // turn on all warnings
      ],
    },
  }

Bug: 168028537
Test: soong test
Change-Id: I8120eeae7cd7b1acdd34c554af996a29e760a368
2021-01-05 10:40:22 +09:00
Anton Hansson
e6056153cf Remove Ignore_missing_latest_api
This flag was only used by sdk_library.go, and is no longer needed
since sdk_library.go now knows which libraries are missing latest_api
tracking files.

Bug: 176092454
Test: m
Change-Id: I5a967f784bde99f103b85654c794e8d7110fd0db
2020-12-31 10:44:38 +00:00
Anton Hansson
ea74599a08 Merge "Stop allowing missing last-api files by default" am: 591920fcfa am: 55677bc46b am: f6e4184684
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1534347

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2c763c877ad92b57fd2a6408f9d64f4aa5b9f1ef
2020-12-31 09:58:02 +00:00
Anton Hansson
9790c37691 Merge "Set previous_api correctly for java_sdk_library" am: 6b8c40036c am: a3804d57a2 am: 003604862b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1534348

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0237942bb160abd3a2711fc661be9a951b6593fc
2020-12-31 09:57:52 +00:00
Anton Hansson
591920fcfa Merge "Stop allowing missing last-api files by default" 2020-12-31 08:53:45 +00:00
Anton Hansson
e87b03d1bb Set previous_api correctly for java_sdk_library
Metalava used this attribute to potentially re-write some nullness
annotations from @Nullable to @RecentlyNonNull, and not doing so can
cause problems when compiling kotlin.

Bug: 176092452
Test: m art.module.public.api.stubs && \
      rm -rf /tmp/lib && \
      unzip -qd /tmp/lib art.module.public.api.stubs.jar && \
      javap -v /tmp/lib/java/util/concurrent/ConcurrentHashMap.class | \
      grep Recently
Change-Id: I9012798f27e39d9a53dbcf0976548f6cec2d3150
2020-12-29 13:24:02 +00:00
Anton Hansson
0615864046 Stop allowing missing last-api files by default
Bug: 176092454
Test: m nothing
Change-Id: I9eadcb774e9898bb4f43054661826326b2c527c2
2020-12-29 13:20:42 +00:00
Jaewoong Jung
a375fe863a Merge "Break up app.go." am: 8bfb63c5a9 am: 1863d9abf8 am: 9aded01f3a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1533144

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3fee391a2dcb19cffea855b44de33a9ecb329a26
2020-12-28 19:11:58 +00:00
Bill Peckham
64c2f473d9 Merge "Automatically set uncompress_dex for java_import." am: 3d419e3b3d am: 3f63ee855d am: f97a71309e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1536102

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I469451e1d992b1a2eab86a55dc65638fc9c3485f
2020-12-28 18:19:17 +00:00
Jaewoong Jung
8bfb63c5a9 Merge "Break up app.go." 2020-12-28 17:50:44 +00:00
Bill Peckham
3d419e3b3d Merge "Automatically set uncompress_dex for java_import." 2020-12-28 17:20:14 +00:00
Treehugger Robot
770149b347 Merge "Use soong_zip -srcjar for proto and aidl srcjars" am: b2d77d4a52 am: edeeabc7e0 am: 1df71d3d13
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1535580

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I139f9a33e0cf7a54448fb9c59183df37e3901ee8
2020-12-24 03:58:21 +00:00
Treehugger Robot
b2d77d4a52 Merge "Use soong_zip -srcjar for proto and aidl srcjars" 2020-12-24 03:04:37 +00:00
Colin Cross
cf02ec8747 Use soong_zip -srcjar for proto and aidl srcjars
IntelliJ's indexer is unhappy with the full paths in the proto
and aidl srcjars.  Use the -srcjar argument to soong_zip, which
causes it to extract the correct filename for .java files based on
the package statement in the file.

Bug: 176209347
Test: manual
Change-Id: I63d9d4f6ba670e3b851835d719519d675ae54c7f
2020-12-23 17:13:16 -08:00
Bill Peckham
ff89ffae0b Automatically set uncompress_dex for java_import.
Setting uncompress_dex for java_import in the same way
as java_library enables using a java_import as an art
jar or a boot jar.

Bug: 175619567
Test: m nothing
Test: TestHiddenAPISingletonWithPrebuilt
Change-Id: I0b552a11d1630a014cf978520ccc5977fdf74066
2020-12-23 16:13:04 -08:00
Treehugger Robot
fc84e8b4d7 Merge "Fix library order in class loader context to agree with PackageManager." am: 7dbc5786e3 am: 13b56f815f am: 49977f12c3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1535013

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I38389beaad89ec6177e4f9eedba3585ad9e8ae59
2020-12-23 21:17:19 +00:00
Treehugger Robot
7dbc5786e3 Merge "Fix library order in class loader context to agree with PackageManager." 2020-12-23 19:58:25 +00:00
Ulya Trafimovich
c9f2b9494d Fix library order in class loader context to agree with PackageManager.
PackageManager adds compatibility libraries for different SDK versions
in descending order, and Soong should do the same.

Bug: 132357300

Test: lunch aosp_cf_x86_phone-userdebug && m \
  && launch_cvd \
  && adb wait-for-device \
  && adb logcat | grep -E 'ClassLoaderContext [a-z ]+ mismatch'

  [no messages "ClassLoaderContext classpath element mismatch"]

Change-Id: Ib1d981808ae4022b2c6e73f407a003e8b8e9c7d6
2020-12-23 18:22:26 +00:00
Anton Hansson
496ea93244 Merge "Add attribute to disable last-api compat tracking" am: 74c8436ce0 am: 325936250d am: de5d8fb877
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1534344

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I77051ff3d3608e69284d707cb8353ba530dbc957
2020-12-23 10:19:04 +00:00
Anton Hansson
74c8436ce0 Merge "Add attribute to disable last-api compat tracking" 2020-12-23 09:05:46 +00:00
Jaewoong Jung
de6671062a Merge "Remove unnecessary snake case variables." am: e794b1e302 am: ce131b6fcf am: e3ec6f723e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1533880

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2e481c45e9fcc2e0023c03aed89320c49678dc86
2020-12-23 02:15:09 +00:00
Jaewoong Jung
18aefc1977 Remove unnecessary snake case variables.
Test: m nothing + TreeHugger
Change-Id: I99f7162944daa6c57c6ae4763261e108bb5cb6b1
2020-12-22 12:38:35 -08:00
Colin Cross
08e19794be Merge "Add car packages to the legacy allowlist" 2020-12-22 19:09:18 +00:00