Commit Graph

3815 Commits

Author SHA1 Message Date
Zhomart Mukhamejanov
b6bce8711f Add "ds-car-dev" to legacyCorePlatformApiModules.
This is for generating AAOS API Docs.

Bug: 162958231
Bug: 163247700
Test: m -j ds-car-docs
Change-Id: Ib084ee6676d4a201f4b60533221036245d3be759
2021-02-26 09:57:11 -08:00
Treehugger Robot
f41b2ab648 Merge "Fix infinite recursion when printing unrecognized linktype" am: f0f152484b am: 2cf358677b am: 98f5b4b6e0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1600834

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I53ea29450f59496f10a896d3712a32c044102efe
2021-02-23 10:22:29 +00:00
Treehugger Robot
98f5b4b6e0 Merge "Fix infinite recursion when printing unrecognized linktype" am: f0f152484b am: 2cf358677b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1600834

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9d51880f8ccdbbdc5f281e182f987f543b4b3ed2
2021-02-23 08:42:44 +00:00
Colin Cross
24bdd3ae4f Merge "Add ArcSettings and SettingsGoogle to the legacy allowlist" into rvc-qpr-dev-plus-aosp 2021-02-23 04:12:51 +00:00
Colin Cross
e8c07c5c54 Merge changes from topic "SettingsGoogle-bp-rvc-qpr-dev-plus-aosp" into sc-dev
* changes:
  Add ArcSettings and SettingsGoogle to the legacy allowlist 2p: fdc78fd88d
  Add ArcSettings and SettingsGoogle to the legacy allowlist
2021-02-23 04:12:51 +00:00
Jiyong Park
d4cbf34032 Fix infinite recursion when printing unrecognized linktype
Bug: N/A
Test: remove some cases from String() so that some linktypes go to the
default path. Then run m nothing. No infinite recursion. Error is
correctly shown.
PANIC=String method: unrecognized linktype: 5
Change-Id: I424755bc89871fc2144ff22d6391f57157cd434d

Change-Id: Ice791025dc50f44ffabd1050bafc5ea35023d32c
2021-02-23 04:02:23 +00:00
Treehugger Robot
d1abafe830 Merge "Limit the number of the Java source files in a single compilation unit" am: a61a042fa6 am: 3e97f39674 am: 398253b55c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1590694

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If636ff3863b1b81256abd20bd139160bfd56aedc
2021-02-23 02:21:19 +00:00
Treehugger Robot
173eeb8ca0 Merge "Add ctx to AndroidMkExtraEntriesFunc" am: 277303f042 am: 5b72de988f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1360943

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I90ae8f53df60dd6bdbc9ae040c44a28a334017e3
2021-02-23 01:45:26 +00:00
Treehugger Robot
398253b55c Merge "Limit the number of the Java source files in a single compilation unit" am: a61a042fa6 am: 3e97f39674
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1590694

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I887bfca8ce13ced6aa4005afa97a8c7e425716b4
2021-02-23 01:45:06 +00:00
Treehugger Robot
277303f042 Merge "Add ctx to AndroidMkExtraEntriesFunc" 2021-02-22 22:40:31 +00:00
Presubmit Automerger Backend
342efcad1c Add ArcSettings and SettingsGoogle to the legacy allowlist 2p: fdc78fd88d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/13630298

Change-Id: I64e8a715538f8515254368ec427bdb6cb1ff996d
2021-02-22 21:44:32 +00:00
Treehugger Robot
a61a042fa6 Merge "Limit the number of the Java source files in a single compilation unit" 2021-02-22 19:54:00 +00:00
Treehugger Robot
c5b87bdc4b Merge "Remove EnforceRROExemptedTargets" am: f0a869847a am: 7a7c1491c4 am: a9cf772572
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1596231

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I61fd5f110aefd4f3ba2b79219f40a66251464117
2021-02-20 04:07:41 +00:00
Treehugger Robot
a9cf772572 Merge "Remove EnforceRROExemptedTargets" am: f0a869847a am: 7a7c1491c4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1596231

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic7fc17dd2f173a1e28509012b4eb7c8bc3872c43
2021-02-20 03:24:59 +00:00
Treehugger Robot
f0a869847a Merge "Remove EnforceRROExemptedTargets" 2021-02-20 01:47:43 +00:00
Colin Cross
aa2555387d Add ctx to AndroidMkExtraEntriesFunc
Add a ctx parameter to AndroidMkExtraEntriesFunc to allow them to
access providers.

Test: m checkbuild
Change-Id: Id6becc1e425c3c3d8519248f8c0ce80777fac7cc
Merged-In: Id6becc1e425c3c3d8519248f8c0ce80777fac7cc
2021-02-19 23:05:40 +00:00
Colin Cross
fdc78fd88d Add ArcSettings and SettingsGoogle to the legacy allowlist
Settings-core is already in the allowlist, ArcSettings and
SettingsGoogle need to compile the same source files but were
in Android.mk files.  Add them to the allowlist so they can
be converted to Android.bp.

This relands I73bef76ecc517223827ac6f3cb1f0624c738fb9d.

Bug: 175124789
Change-Id: I6e116b5d4574990c8513371bbbb5175f2516c98f
Test: m RunSettingsGoogleRoboTests RunArcSettingsRoboTests
2021-02-19 19:18:41 +00:00
Jeongik Cha
cee5ba973d Remove EnforceRROExemptedTargets
There is no more target relying on EnforceRROExemptedTargets

Bug: 150820813
Test: m
Change-Id: If50d22c0e4f99e8c50d6a30cb94a0c3a5646b6fa
2021-02-19 12:16:12 +09:00
TreeHugger Robot
bd72625520 Merge "Add ctx to AndroidMkExtraEntriesFunc" into sc-dev 2021-02-19 01:03:10 +00:00
Pedro Loureiro
c14cf5825c Merge "Add support for lint baseline files" am: 8a75058d3f am: 85c97f861a am: 2464363376
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1589498

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7cb9ba83444af9df321adb9b8b16adeb2157a67e
2021-02-18 17:13:34 +00:00
Pedro Loureiro
2464363376 Merge "Add support for lint baseline files" am: 8a75058d3f am: 85c97f861a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1589498

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a43fdd2881f47d00611e9cf5c145100d996e135
2021-02-18 16:52:26 +00:00
Treehugger Robot
d061be5058 Merge "Further simplify the link type check routine" am: ca52bfcf0f am: 48d587d67a am: 3d23a56d6b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1593592

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I58f163e3c9520cb7d93cb097e10eaac5ee690280
2021-02-18 16:20:57 +00:00
Jiyong Park
2f04e04502 Merge "Linktype check error message becomes more correct" am: 4941e4b9d1 am: 4de1a5651f am: 605bc52821
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1593811

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6158deb212cd32e2f41a5484376a6791cfca2460
2021-02-18 16:20:01 +00:00
Pedro Loureiro
8a75058d3f Merge "Add support for lint baseline files" 2021-02-18 15:53:13 +00:00
Treehugger Robot
3d23a56d6b Merge "Further simplify the link type check routine" am: ca52bfcf0f am: 48d587d67a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1593592

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I545f48aac7a1bf76973b3e05b289590e9c039286
2021-02-18 15:49:26 +00:00
Jiyong Park
605bc52821 Merge "Linktype check error message becomes more correct" am: 4941e4b9d1 am: 4de1a5651f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1593811

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3f9b8a7add946d82ea2adecc53ffc44176aea01f
2021-02-18 15:46:44 +00:00
Treehugger Robot
ca52bfcf0f Merge "Further simplify the link type check routine" 2021-02-18 13:54:27 +00:00
Jiyong Park
4941e4b9d1 Merge "Linktype check error message becomes more correct" 2021-02-18 11:32:03 +00:00
Jiyong Park
7f87e1ab49 Further simplify the link type check routine
Bug: 180477804
Test: m nothing
Change-Id: I216be96cf844fe42ba0cec467eea8520ff4ef4f2
2021-02-18 20:29:05 +09:00
Pedro Loureiro
5d190cc24e Add support for lint baseline files
Test: m droid
Test: go test ^TestJavaLint # (from soong/build/java)

Change-Id: I249a0a0597b0bf8495460ed283b476ad2eb36edc
2021-02-18 11:15:30 +00:00
Anton Hansson
3b8a42e601 Merge "Use genrule instead of filegroup for api files" am: 3de06eae5b am: e223268ed8 am: 9b74b06e65
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1592331

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I71d2c8582bd5d8e1651c8df5971354024dbc5e2b
2021-02-18 10:48:42 +00:00
Martin Stjernholm
c4a1ede482 Merge "Move the logic to add jacocoagent in instrumentation builds to make." am: 71c139dced am: 2eed280a39 am: dd34be43f1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1592232

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I86b1c559c714826a4fa4d4ae47ab85d07322715f
2021-02-18 10:48:29 +00:00
Anton Hansson
9b74b06e65 Merge "Use genrule instead of filegroup for api files" am: 3de06eae5b am: e223268ed8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1592331

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If3e7f7af46b93dd25fb5eca1e820bf32b2e1144c
2021-02-18 10:43:19 +00:00
Anton Hansson
3de06eae5b Merge "Use genrule instead of filegroup for api files" 2021-02-18 09:28:01 +00:00
Martin Stjernholm
dd34be43f1 Merge "Move the logic to add jacocoagent in instrumentation builds to make." am: 71c139dced am: 2eed280a39
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1592232

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I526b557a0e82d2b953b0b603ae8b2a5dc9bcba95
2021-02-18 09:06:43 +00:00
Jiyong Park
670e0f62a6 Linktype check error message becomes more correct
The type linkType has String() method and the error message is created
using it.

Bug: 180477804
Test: m nothing
Change-Id: I74fe9c93b74904177dbe9d29cd3aa3304b67ba4f
2021-02-18 13:10:18 +09:00
Colin Cross
f79fee864c Add ctx to AndroidMkExtraEntriesFunc
Add a ctx parameter to AndroidMkExtraEntriesFunc to allow them to
access providers.

Bug: 180540739
Test: m checkbuild
Change-Id: Id6becc1e425c3c3d8519248f8c0ce80777fac7cc
2021-02-17 15:24:43 -08:00
Ulyana Trafimovich
92dac721f6 Revert^3 "Enforce <uses-library> checks for android_app and android_app_import."
This reverts commit c2b6b65d73.

Reason for revert: These changes should only be reverted in
  rvc-qpr-dev-plus-aosp, but not in master.

Bug: 132357300
Test: treehugger
Change-Id: I3243668ce9a399936b0e9dde09c42db6cc45d562
2021-02-17 18:13:33 +00:00
Anton Hansson
c79d412b8a Use genrule instead of filegroup for api files
filegroups have the unfortunate limitation that they don't create phony
targets for building them in a convenient way. Also, having a single
output file fits better with the genrule concept.

Test: m framework-sdkextensions.api.public.latest
Change-Id: I229410658b04403ff1ff6abd4116a65aaa02b83b
2021-02-17 17:16:43 +00:00
Martin Stjernholm
0a9dae6e9a Move the logic to add jacocoagent in instrumentation builds to make.
Test: m nothing
Test: m nothing EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true
Bug: 180325915
Change-Id: Ieec8c8a122ff930e14cef4b5a0a2f9fc9e3b70ad
2021-02-17 14:41:07 +00:00
Jiyong Park
7d43709811 Revert "data dependency of java_test_host can be arch-specific" am: 2b0e4908c2 am: 4362e740af am: 1cea07c8ab
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1588300

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I25b7c1b75a28247ce220fc09b50d9faa96b90fc1
2021-02-17 00:45:48 +00:00
Jiyong Park
1cea07c8ab Revert "data dependency of java_test_host can be arch-specific" am: 2b0e4908c2 am: 4362e740af
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1588300

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2e78f3d281517016afeb7b24d5dd1b8249124183
2021-02-17 00:25:41 +00:00
Jiyong Park
4362e740af Revert "data dependency of java_test_host can be arch-specific" am: 2b0e4908c2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1588300

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iae42079a404a59730f2eb622fa39d462610f0c50
2021-02-16 23:54:29 +00:00
Treehugger Robot
b913011777 Merge changes from topic "mkboot"
* changes:
  prebuilt_etc is OutputFileProducer
  Revert "`data` dependency of java_test_host can be arch-specific"
2021-02-16 23:27:32 +00:00
Sasha Smundak
b0addafd93 Limit the number of the Java source files in a single compilation unit
KYTHE_JAVA_SOURCE_BATCH_SIZE environment variable controls this setting.
The limit is 1000 if this variable is not set.

Fixes: 179932118
Test: run prebuilts/build-tools/build-prebuilts.sh, use it to build kzips, check
Change-Id: I9ad57dfd1d2c2dce5cff755b1bd61cf933420bd3
2021-02-16 15:14:52 -08:00
Paul Duffin
f7101aee5c Allow explicitly specified additional annotations for hiddenapi am: 031d8693b3 am: bf069dad5a am: de2b2c98bb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1587494

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia7afd1593fb019fa80ac8266d2a494008b584993
2021-02-16 19:46:50 +00:00
Paul Duffin
de2b2c98bb Allow explicitly specified additional annotations for hiddenapi am: 031d8693b3 am: bf069dad5a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1587494

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1ecd067d64af390dfebd2bdbf3520765dbda3906
2021-02-16 18:52:01 +00:00
Paul Duffin
031d8693b3 Allow explicitly specified additional annotations for hiddenapi
Adds the hiddenapi_additional_annotations to allow a library to list
the libraries that provided additional hiddenapi related annotations
for a library.

Modifies merge_csv.py so it can process multiple zip files at the same
time and uses that to merge the embedded .uau files from a module and
those it depends upon.

Bug: 180102243
Test: m droid
      Verified that hiddenapi files (both aggregated ones and for the
      individual modules) are not affected by this change.
Change-Id: I796520021c7357398a9e2a09f1029e4a578b05b3
2021-02-16 13:28:26 +00:00
Jiyong Park
2b0e4908c2 Revert "data dependency of java_test_host can be arch-specific"
This reverts commit cdd9b8392d.

Reason: this doesn't work. java_test_host is a multi target module.
Therefore, `arch.<arhc>.data` is not collapsed to `data` by the arch
mutator.

Bug: N/A
Test: N/A
Change-Id: I755b06718bacfe1513f6ad1e734e5a0d0ac57cd8
2021-02-16 06:58:53 +09:00
Anton Hansson
9fda310903 Merge "Fix api_fingerprint.txt generation" am: 404adeefdc am: c0777462c5 am: 7c9e60e17c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1581731

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If70bb62104c8325e65e1d6ce78e5d04bc5948b66
2021-02-15 13:06:02 +00:00