Commit Graph

19 Commits

Author SHA1 Message Date
Paul Duffin 24f983c98d Merge "Remove uses of buildDir from java/app_import_test.go" am: 6567d07f59 am: c9d8035712 am: de9cbc5d2e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1649798

Change-Id: Ie9348fcb8641066fc0159a83d94fbeecb9eaf2b6
2021-03-24 08:56:54 +00:00
Paul Duffin de9cbc5d2e Merge "Remove uses of buildDir from java/app_import_test.go" am: 6567d07f59 am: c9d8035712
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1649798

Change-Id: Ia01eb0d840fad738684107da378a48edc7d6780f
2021-03-24 08:52:35 +00:00
Paul Duffin fb8bc95199 Remove uses of buildDir from java/app_import_test.go
Remove any uses, either direct (or indirect via testJavaConfig or
similar methods), of the package level buildDir variable from this
file.

Bug: 182885307
Test: m nothing
Change-Id: I700a3cafaa427243212aab1eb903d1871327483c
2021-03-24 00:01:15 +00:00
Jaewoong Jung bc098a5c26 Merge "Lineage properties support module references." am: 6df5e0307d am: c3df3c5396 am: 4bd1fc1763
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625101

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id5f3b9ab9ba11e274a4921a9ab07392b1bb891ff
2021-03-11 03:04:25 +00:00
Jaewoong Jung 4bd1fc1763 Merge "Lineage properties support module references." am: 6df5e0307d am: c3df3c5396
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625101

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8541e1e2aa1e9866e7616167f3305e2cd9c53419
2021-03-11 02:19:57 +00:00
Jaewoong Jung 1c1b6e6d95 Lineage properties support module references.
They should have had `android:"path"` tags attached so that users can
point them to filegroup modules.

Test: app_test.go & app_import_test.go
Bug: 182175153
Change-Id: I5580408488ffe5fc12c869cbfb7a468713dcbc96
2021-03-09 15:14:34 -08:00
Jaewoong Jung f75649f692 Merge "Add additional_certificates to android_app_import." am: 05ebca4f7f am: 6ea8f69bc5 am: f10cb18a20
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1622565

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iba08d54ace799cb2a6dba7cc5983234fcee5f33f
2021-03-09 16:27:01 +00:00
Jaewoong Jung f10cb18a20 Merge "Add additional_certificates to android_app_import." am: 05ebca4f7f am: 6ea8f69bc5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1622565

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ccbc3abbfad8807ca00f4fd27a23d975483f6b3
2021-03-09 15:44:34 +00:00
Jaewoong Jung 25ae8dec91 Add additional_certificates to android_app_import.
Bug: 182175153
Test: app_import_test,go
Change-Id: I467e98065945b59dcc574a18144756edccdea441
2021-03-08 17:37:46 -08: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
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
TreeHugger Robot bd72625520 Merge "Add ctx to AndroidMkExtraEntriesFunc" into sc-dev 2021-02-19 01:03:10 +00: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
Bill Peckham 6603b7ab73 Merge "Enable android_app_import to supply framework-res." am: 5c2406bde9 am: 50b395b740
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1543901

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia87c7583798ab5c053a154dd8d67b579dd65d8e7
2021-02-08 20:19:59 +00:00
Bill Peckham a036da9b27 Enable android_app_import to supply framework-res.
By enabling an android_app_import module to supply the
special framework-res module, it becomes possible to
create a split build that excludes the source of over
10,000 files under frameworks/base/core/res, replacing
this source with a prebuilt. However, since other parts
of a monolithic build use the source of framework-res,
this scheme works only if your split build manifest
excludes modules that depend on framework-res source.

Bug: 176851898
Test: lunch aosp_arm64-userdebug && m nothing
Test: new TestAndroidAppImportExportPackageResources
Test: local build without prebuilt framework-res
Test: local build with prebuilt framework-res
Change-Id: If00d9dbc656c8406c038448d09f93f767c1e06d1
2021-02-05 14:30:46 -08: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
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
Jaewoong Jung f9b44657c8 Break up app.go.
Test: m nothing + TreeHugger
Change-Id: I64c6d7f10530c424bc282d8111dfaf9159426f00
2020-12-21 12:31:51 -08:00