Commit Graph

24 Commits

Author SHA1 Message Date
Jingwen Chen
a9df5457ad [conflict] Enable bazel in mainline build script. am: be577742a1 am: d8af540729 am: bbc57ef1c6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2497055

Bug: 263406837
Ignore-AOSP-First: merge conflict resolution.
Change-Id: Ie80461852c504eec276b80459955596f7ffc128a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 20:24:14 +00:00
Jingwen Chen
be577742a1 Enable bazel in mainline build script.
Fixes: 263406837
Test: presubmits
Test: abtd (TBD)
Change-Id: I38eb823d58af04c5f4ae91ae21abc381d0f840bc
2023-03-20 11:08:58 +00:00
Yu Liu
8bcf9b4f35 Add extra_build_params to build_unbundled_mainline_module.sh.
This is in order to override the BUILD_BROKEN_DISABLE_BAZEL flag.

Bug: 268337606
Test: run dcla_apex_comparison_test
Merged-In: Iae29c0c7119ec2cfc641e346280bd60f861b8ae1
Change-Id: I85f5ef21f75844dc206595e34fd72ae831e62105
2023-03-03 00:11:25 +00:00
Sam Delmerico
376d42917e disable Bazel mode for mainline module builds
Bug: 261721870
Change-Id: I4127e843cf1caf460a1c6b949a97ef3418ff895c
Merged-In: I46fccd1b31f428e75982a8f26d9c24e117b671e6
2023-01-06 10:34:06 -05:00
Sam Delmerico
ef34728498 disable Bazel mode for mainline module builds
Bug: 261721870
Ignore-AOSP-First: merge conflicts with aosp/2366499
Change-Id: I46fccd1b31f428e75982a8f26d9c24e117b671e6
2023-01-05 12:06:54 -05:00
Kun Niu
a7c05a7477 Do not differentiate pre-s or s-plus build in
build_unbundled_mainline_module.sh which causes an issue where the modules are built 2x more than needed, instead, pass
pre-s or s-plus build environment variable to the script.

Ignore-AOSP-First: submit to tm-mainline-prod
Test: BUILD_PRE_S_APEX=true ./vendor/google/build/mainline_modules_x86_64.sh
      ./vendor/google/build/mainline_modules_x86_64.sh
Bug: 254774161
Change-Id: I6189788b520e4a6ddb19f5992096a111f22984b5
2022-11-02 00:27:53 +00:00
Baligh Uddin
d75f9415cb Revert "Revert "Add BUILD_PRE_S_APEX to conditionally generate p..."
Revert "Revert "[automerge] Remove APEX_BUILD_FOR_PRE_S_DEVICES ..."

Revert submission 19903549-revert-19868116-bug_235701311-FFTJAQCCJV

Reason for revert: Broken test is due to test hardcoding of path - we will disable and fix test independently.

Reverted Changes:
I46d431149:[automerge] Revert "Remove APEX_BUILD_FOR_PRE_S_DE...
I851e6696b:[automerge] Revert "Add BUILD_PRE_S_APEX to condit...
Iabab84785:Revert "[automerge] Add BUILD_PRE_S_APEX to condit...
If54cb140a:Revert "Remove APEX_BUILD_FOR_PRE_S_DEVICES from m...
I63c5cb189:Revert "Add BUILD_PRE_S_APEX to conditionally gene...
Icaa93901e:Revert "[automerge] Remove APEX_BUILD_FOR_PRE_S_DE...

Change-Id: I12def1213b7a9c81bdcbc9605cb15ab1e24047bf
2022-09-09 19:01:31 +00:00
Nick Chalko
e40ebf93e3 Revert "Add BUILD_PRE_S_APEX to conditionally generate pre-S apex."
Revert "[automerge] Remove APEX_BUILD_FOR_PRE_S_DEVICES from mod..."

Revert submission 19868116-bug_235701311


Ignore-AOSP-First: Will cherrypick into AOSP once tm-mlp is done.
Bug: 245770164
Reason for revert: DroidMonitor:Fix for Bug 245770164 - verified http://go/forrest-run/L09500000956325462
Reverted Changes:
Idc1639109:Remove APEX_BUILD_FOR_PRE_S_DEVICES from module bu...
I9481ec7eb:[automerge] Remove APEX_BUILD_FOR_PRE_S_DEVICES fr...
I0c91d1adc:[automerge] Add BUILD_PRE_S_APEX to conditionally ...
Iae29c0c71:Add BUILD_PRE_S_APEX to conditionally generate pre...

Change-Id: I63c5cb18943ad8112f31f648a77b16f3341bb8a9
2022-09-08 20:49:44 +00:00
Baligh Uddin
d1ae2611f2 Add BUILD_PRE_S_APEX to conditionally generate pre-S apex.
Used in CI and BUILD_PRE_S_APEX passed in via command line arguments.
default=false, to prevent presubmit run-time regression.

Ignore-AOSP-First: Will cherrypick into AOSP once tm-mlp is done.
BUG: 198437211
BUG: 235701311
Test: TH and local build.
Change-Id: Iae29c0c7119ec2cfc641e346280bd60f861b8ae1
2022-09-08 17:53:54 +00:00
Motomu Utsumi
bed435be74 Remove NetworkPermissionConfig package
Move declaration of MAINLINE_NETWORK_STACK permission from the
NetworkPermissionConfig package to the NetworkStack package.

Bug: 223649084
Test: m
Merged-In: I9d2ad14b594402492eb8f4a8df34fa616a542a0a
(cherry picked from 9ea376ddb2)
Merged-In: I29164cc0d936139a023d269eb53d612a8b5fe681

Change-Id: Ibaebe2ff17fecf43cb3a494dd962d4da763c70b8
2022-06-01 02:52:28 +00:00
Ling Ma
c6e131555a Removed telephony apex
Will not need this in near future.

Fix: 230729916
Test: Build
Change-Id: I908b125a4b44d60eac1ee9c7d801d3e7f38add5d
Merged-In: I908b125a4b44d60eac1ee9c7d801d3e7f38add5d
2022-05-17 17:50:57 +00:00
Ling Ma
8f40d4dd24 Removed telephony apex
Will not need this in near future.

Fix: 230729916
Test: Build
Change-Id: I908b125a4b44d60eac1ee9c7d801d3e7f38add5d
2022-05-05 21:19:21 +00:00
Motomu Utsumi
9ea376ddb2 Remove NetworkPermissionConfig package
Move declaration of MAINLINE_NETWORK_STACK permission from the
NetworkPermissionConfig package to the NetworkStack package.

Bug: 223649084
Test: m
Ignore-AOSP-First: changes in topics with internal-only projects
Change-Id: I9d2ad14b594402492eb8f4a8df34fa616a542a0a
2022-04-20 09:46:31 +00:00
satayev
93bc276498 Add Sepolicy module to presubmit. am: faaf927797 am: 5eb74e0a72
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1975106

Change-Id: I9614483cf16cf8618b31089f6b0c209a7c3d2324
2022-02-09 14:01:43 +00:00
satayev
5eb74e0a72 Add Sepolicy module to presubmit. am: faaf927797
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1975106

Change-Id: Ibc3fb9531ef49008ca797b961acaf121fa4162b2
2022-02-09 13:44:50 +00:00
satayev
faaf927797 Add Sepolicy module to presubmit.
Bug: 199914227
Test: presubmit
Change-Id: I7f75c8b76a1f99af03d83fe7ccfd9032f7fe2249
2022-02-07 18:11:46 +00:00
satayev
4a68e325c8 Disable ipsec and tethering module builds on postsubmit. am: 236d765ba3 am: b55a4286b3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1924422

Change-Id: I3586d37389256df1643f23183a49024a5f759c8e
2021-12-15 18:09:43 +00:00
satayev
b55a4286b3 Disable ipsec and tethering module builds on postsubmit. am: 236d765ba3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1924422

Change-Id: I27e890002de0f9f8c465ffe47e2db57089350f4b
2021-12-15 17:53:58 +00:00
satayev
236d765ba3 Disable ipsec and tethering module builds on postsubmit.
We are enabling continous postsubmit builds for AOSP modules. These
modules are not building at ToT at the moment; exclude them so we can
get a green postsubmit build for other modules.

Bug: 210694291
Test: run packages/modules/common/build/mainline_modules_x86_64.sh locally
Change-Id: Iea756639962e5c87a4ae5539890a9ab8909286c3
2021-12-15 16:03:43 +00:00
Taras Antoshchuk
563e68335b Remove NetworkStackNext from build script
NetworkStackNext is not expected to compile on sc-mainline-prod.

Test: presubmit
Change-Id: Id1586da283046409a689fe7bb12ed905b6cd63d1
Ignore-AOSP-First: this change is sc-mainline-prod specific.
Merged-In: I48e8b9422c8703cd4cec6552e0dcfd3b82021816
2021-11-15 13:31:36 +01:00
Martin Stjernholm
2aed427c97 Remove UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true setting (reland).
It needs to be controlled by build instead:

- Prebuilt SDKs should be used for unbundled Mainline module builds, and
  is necessary on thin module branches to avoid dependencies on
  frameworks/base (e.g. framework-doc-stubs used by lint-check).

- Source SDKs are needed on master which can otherwise get problems
  with out of date prebuilts (see e.g. b/140162931).

This relands https://r.android.com/1862861 after (temporarily)
overriding the flag to true in Mainline builds (cl/405889455), until
b/204189791 is fixed.

Test: env TARGET_BUILD_APPS=com.android.art \
        packages/modules/common/build/build_unbundled_mainline_module.sh \
        --product module_arm --dist_dir out/dist
  using the thin master-art manifest
Bug: 202192894
Change-Id: I974be07cfcc5a02611b465cc402178985d8decd8
2021-10-27 20:48:03 +01:00
Makoto Onuki
84b8ab1756 Revert "Remove UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true setting."
This reverts commit 4927b9431a.

Reason for revert: DroidMonitor: Potential culprit for Bug 203782007 - verifying through Forrest before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Change-Id: Icdaec49345ef916f2e8e06b14dffea8608375d53
2021-10-21 16:50:52 +00:00
Martin Stjernholm
4927b9431a Remove UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true setting.
It needs to be controlled by build instead:

- Prebuilt SDKs should be used for unbundled Mainline module builds, and
  is necessary on thin module branches to avoid dependencies on
  frameworks/base (e.g. framework-doc-stubs used by lint-check).

- Source SDKs are needed on master which can otherwise get problems
  with out of date prebuilts (see e.g. b/140162931).

Test: env TARGET_BUILD_APPS=com.android.art \
        packages/modules/common/build/build_unbundled_mainline_module.sh \
        --product module_arm --dist_dir out/dist
  using the thin master-art manifest
Bug: 202192894
Change-Id: Ia73ccc6e694caec64c7dd0d86246a258e2bb9239
2021-10-20 14:07:15 +01:00
satayev
37abbfca2a Introduce build script for mainline modules.
The build_unbundled_mainline_module.sh builds for a given product
a list of mainline modules. In AOSP it defaults to building all
AOSP modules.

Individual mainline_modules_<arch>.sh scripts are meant to build per
product targets for individual invocation on build servers. For example,
on AOSP presubmit we would want to build mainline_modules_x86_64.

The build script is meant to be re-used from internal version of the
scripts that would pass com.google variant of the modules.

Note that the script excludes bundles and stubs, since those are not
need to be built in AOSP. There will be a separate script internally
for those.

Bug: 191965323
Test: call the scripts, inspect out/dist/ directory.
Change-Id: I13dc723dd26fd8a2a43f46c3186513bcf5519fb5
2021-07-13 11:46:53 +01:00