Commit Graph

31955 Commits

Author SHA1 Message Date
Martin Stjernholm
47dcbeaefb Build modules from source for module products.
This overrides the branch default
(BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE) if it is set to use
prebuilts.

Test: build/soong/soong_ui.bash --dumpvar-mode MODULE_BUILD_FROM_SOURCE
  returns false with BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE:=false
  in internal
Test: env TARGET_PRODUCT=module_arm64 \
      build/soong/soong_ui.bash --dumpvar-mode MODULE_BUILD_FROM_SOURCE
  returns true with BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE:=false
  in internal
Test: env TARGET_PRODUCT=mainline_modules_x86 \
      build/soong/soong_ui.bash --dumpvar-mode MODULE_BUILD_FROM_SOURCE
  returns true with BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE:=false
  in internal
Test: env TARGET_PRODUCT=redfin \
      build/soong/soong_ui.bash --dumpvar-mode MODULE_BUILD_FROM_SOURCE
  returns false with BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE:=false
  in internal
Bug: 222723757
Change-Id: I0faea006b0e95eff40bbfbe00cc74ba5985beeba
2022-03-30 18:16:51 +01:00
Treehugger Robot
b418d7a46a Merge "Always turn on TARGET_BUILD_USE_PREBUILT_SDKS for unbundled build." am: ddfa3ff19c am: c64f248280 am: 57d7999f5a
Original change: https://android-review.googlesource.com/c/platform/build/+/2045278

Change-Id: I6b3a92c2aadb16e762316cd68dd23d5f3a8a07e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 12:11:25 +00:00
Treehugger Robot
57d7999f5a Merge "Always turn on TARGET_BUILD_USE_PREBUILT_SDKS for unbundled build." am: ddfa3ff19c am: c64f248280
Original change: https://android-review.googlesource.com/c/platform/build/+/2045278

Change-Id: I8ff931bbd95218c40e3f08b49bcbf06720b99764
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 11:46:52 +00:00
Treehugger Robot
ddfa3ff19c Merge "Always turn on TARGET_BUILD_USE_PREBUILT_SDKS for unbundled build." 2022-03-30 11:06:46 +00:00
Bowgo Tsai
b0f436386f Support per-partition settings for os_version AVB props
The value of the AVB properties are parsed by the device
bootloader, which might expect a different format of the value.
Allowing them to have per-device settings.

The default value of those per-partition os_version is
$(PLATFORM_VERSION_LAST_STABLE), which is usually an integer,
e.g., 12.

Bug: 211364958
Test: build then `avbtool info_image`
Change-Id: I2005df615c0ff35622030baa2477e29d9d20e94f
2022-03-30 11:52:39 +08:00
Android Build Coastguard Worker
5f0ce9a427 Version bump to TP1A.220330.003 [core/build_id.mk]
Change-Id: Ieea4420a1c909e2f6d70702d88977757573436df
2022-03-30 03:39:12 +00:00
Treehugger Robot
518142885e Merge "Exclude deprecated variables from dump-variables-rbc" am: 0b7aea6dc5 am: a48a2935f3 am: 5c714e950c
Original change: https://android-review.googlesource.com/c/platform/build/+/2042024

Change-Id: I33219a584c87e0f67635edc1f3e273e59a2f3ced
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 02:51:48 +00:00
Treehugger Robot
5c714e950c Merge "Exclude deprecated variables from dump-variables-rbc" am: 0b7aea6dc5 am: a48a2935f3
Original change: https://android-review.googlesource.com/c/platform/build/+/2042024

Change-Id: I4678710787f617a83230ce6fd5f81bfee5e3c016
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 02:37:06 +00:00
Android Build Coastguard Worker
71b315fb2f Version bump to TP1A.220330.002 [core/build_id.mk]
Change-Id: I8576dd56ac64be746eb82809f40358c476640ee0
2022-03-30 02:21:13 +00:00
Treehugger Robot
0b7aea6dc5 Merge "Exclude deprecated variables from dump-variables-rbc" 2022-03-30 02:03:23 +00:00
Android Build Coastguard Worker
c75b8dd9b3 Make change and version bump to TP1A.220330.001
Change-Id: I14049e9b1091ab660e089f3d39407c7afc5976a5
2022-03-30 01:20:40 +00:00
Android Build Coastguard Worker
131e154891 Make change and version bump to SQ3A.220330.001
Change-Id: I1e8eb2e4a4cabd0fcce4fd1d4267d214b5125d65
2022-03-29 23:17:59 +00:00
Treehugger Robot
59a3f57416 Merge "Add implementation of dir function" am: fa92dd5f32 am: 25ab8f0b90 am: 600329f3ef
Original change: https://android-review.googlesource.com/c/platform/build/+/2045947

Change-Id: I6d844a67874abdd5eab5167cfb712bb528924561
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 22:10:25 +00:00
Treehugger Robot
600329f3ef Merge "Add implementation of dir function" am: fa92dd5f32 am: 25ab8f0b90
Original change: https://android-review.googlesource.com/c/platform/build/+/2045947

Change-Id: If2986092413e96673c5656f298d6333a9bea6781
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 21:56:57 +00:00
Treehugger Robot
fa92dd5f32 Merge "Add implementation of dir function" 2022-03-29 21:13:47 +00:00
Cole Faust
0a746001b8 Exclude deprecated variables from dump-variables-rbc
This is to not show a warning when running the RBC product
config.

Bug: 226622262
Test: Manually
Change-Id: I69265c9d0dd475ada670e26295bdf27dfa407706
2022-03-29 13:49:26 -07:00
Android Build Coastguard Worker
b7e93acc1b Version bump to TP1A.220329.002 [core/build_id.mk]
Change-Id: If6e0d756a8a468fe5ebf9c5e8a931a5f62bd2355
2022-03-29 19:15:02 +00:00
Jiakai Zhang
11f44e2802 Always turn on TARGET_BUILD_USE_PREBUILT_SDKS for unbundled build.
Before this change, TARGET_BUILD_USE_PREBUILT_SDKS was turned on only if
TARGET_BUILD_APPS or TARGET_BUILD_UNBUNDLED_IMAGE is set. After this
change, TARGET_BUILD_USE_PREBUILT_SDKS is always turned on if
TARGET_BUILD_UNBUNDLED is set.

We need this change because we need to build ART services on the thin
manifest, and ART's build script only sets TARGET_BUILD_UNBUNDLED.

Bug: 177273468
Test: (on aosp-master-art) . ./build/envsetup.sh && lunch arm_krait-eng && art/tools/buildbot-build.sh --target
Change-Id: I1b5f63043d518ac8306bd172ef8afd69ab3ae8e5
2022-03-29 16:11:12 +01:00
Lucas Wei
b235b690a0 Remove ALL_GENERATED_SOURCES
ALL_GENERATED_SOURCES contains the generated sources of modules
defined in Make.  They always have a path inside the intermediates
directories.  The only readers of ALL_GENERATED_SOURCES are filtering
for files in the output directories, and will never match anything.

Signed-off-by: Lucas Wei <lucaswei@google.com>
Change-Id: I38c57cc6dad7d762adc001351322c0614e69ed98
2022-03-29 18:01:58 +08:00
Android Build Coastguard Worker
f35ed65855 Make change and version bump to TP1A.220329.001
Change-Id: I8e0ee89460b9e833eff879ad97ea44be6f26d574
2022-03-29 01:20:31 +00:00
Cole Faust
db13a58184 Add implementation of dir function
mk2rbc was already emitting conversions of the dir
function, but its implementation didn't exist.

Bug: 227245326
Test: Manually
Change-Id: I3348c022a0ff84e6d3a5be6b18e45c439f1db802
2022-03-28 16:31:26 -07:00
Android Build Coastguard Worker
9736267ffe Make change and version bump to SQ3A.220329.001
Change-Id: Icd6137d45cc083fbeb01de63efa191fe758b927f
2022-03-28 23:18:14 +00:00
Android Build Coastguard Worker
21bd25c44d Version bump to TP1A.220328.002 [core/build_id.mk]
Change-Id: Ie7df2867907b24dddaffa47002f8a562f982470b
2022-03-28 16:05:06 +00:00
Android Build Coastguard Worker
b813d7a6a0 Make change and version bump to TP1A.220328.001
Change-Id: I3af018a76536ccee5644df0598954c212b45a897
2022-03-27 23:21:14 +00:00
Android Build Coastguard Worker
894bd220bf Make change and version bump to TP1A.220327.001
Change-Id: I46e8fd3e19669a7b7216c4ad07c1ae349ab7ab14
2022-03-26 23:20:16 +00:00
Android Build Coastguard Worker
79de99560a Make change and version bump to SQ3A.220327.001
Change-Id: I9a7a29bfd3cb6e4ab6e301ade2f296e94d155cd1
2022-03-26 21:18:02 +00:00
Treehugger Robot
be88f3a95c Merge "Add fake_packages to the list of exceptions to INSTALLED_FILES_OUTSIDE_PACKAGES" am: d3a9957616 am: a2fefe18bd am: 486c2e88ee
Original change: https://android-review.googlesource.com/c/platform/build/+/2043302

Change-Id: I522290e838020487bdf5865998e0d73529b656bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-26 04:35:55 +00:00
Treehugger Robot
486c2e88ee Merge "Add fake_packages to the list of exceptions to INSTALLED_FILES_OUTSIDE_PACKAGES" am: d3a9957616 am: a2fefe18bd
Original change: https://android-review.googlesource.com/c/platform/build/+/2043302

Change-Id: I39165bf40b18b3118f7746a894108aa25bd8d73a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-26 04:22:57 +00:00
Treehugger Robot
d3a9957616 Merge "Add fake_packages to the list of exceptions to INSTALLED_FILES_OUTSIDE_PACKAGES" 2022-03-26 03:45:21 +00:00
Android Build Coastguard Worker
102236a889 Make change and version bump to TP1A.220326.001
Change-Id: I4896e93d337bb21cd1f1c5ae1395ca6cfac9b180
2022-03-26 03:20:29 +00:00
Android Build Coastguard Worker
c942c6f67f Make change and version bump to SQ3A.220326.001
Change-Id: Ia6310767dc701b179d72cc866f20ffe090c6eac0
2022-03-26 01:18:04 +00:00
Colin Cross
41e93ea093 Add fake_packages to the list of exceptions to INSTALLED_FILES_OUTSIDE_PACKAGES
Don't depend on fake_packages, they are already expanded into their
required modules.

Bug: 225187583
Bug: 226573153
Test: check dependency path to out/target/product/coral/system/apex/com.android.vndk.current.apex
Change-Id: Id7a646fe0368051a4a4719f846a158de07be9d20
2022-03-25 17:31:49 -07:00
Android Build Coastguard Worker
c13709be92 Version bump to TP1A.220325.002 [core/build_id.mk]
Change-Id: I54df698bc0de887596a31bcc9f8f61be17759b5d
2022-03-25 21:35:13 +00:00
Trevor Radcliffe
d7f8cd653e Merge "Add DeviceProduct product varible to Soong" am: d1bb5919e3 am: b40d50e902 am: 7c3ef9b405
Original change: https://android-review.googlesource.com/c/platform/build/+/2037483

Change-Id: I114e9236fa7b6f966bf6404006e4998bcecfef1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 17:38:34 +00:00
Trevor Radcliffe
7c3ef9b405 Merge "Add DeviceProduct product varible to Soong" am: d1bb5919e3 am: b40d50e902
Original change: https://android-review.googlesource.com/c/platform/build/+/2037483

Change-Id: Ibb702c42fa3f42f4dd8ae6086498ccd8249e5da6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 17:16:28 +00:00
Trevor Radcliffe
d1bb5919e3 Merge "Add DeviceProduct product varible to Soong" 2022-03-25 14:34:23 +00:00
Android Build Coastguard Worker
eacfe65d9f Make change and version bump to TP1A.220325.001
Change-Id: Iaee45d52e376f033f45a0d82a61f09c3a2b3850d
2022-03-25 01:20:37 +00:00
Cole Faust
08e78b9fa4 Update paths to mk2rbc/rbcrun
They're now directly under the out folder instead
of out/soong.

Bug: 226677850
Test: Manually
Change-Id: I6f2d017736323a5a60b0a8d7face723862c0b0b3
2022-03-24 17:32:39 -07:00
Android Build Coastguard Worker
cf8bd02e81 Make change and version bump to SQ3A.220325.001
Change-Id: I34075f714badfd75cfbdd5923751f431b9d446e0
2022-03-24 23:18:39 +00:00
Cole Faust
2d11a7afd3 Merge "Fix single value inheritance" am: e721764192 am: aa1a0218c0 am: d332c248cd
Original change: https://android-review.googlesource.com/c/platform/build/+/2036932

Change-Id: I30c43a1a53a890efb70df6aa751966a6dac67f52
Signed-off-by: Automerger Merge Worker
2022-03-24 21:39:15 +00:00
Cole Faust
d332c248cd Merge "Fix single value inheritance" am: e721764192 am: aa1a0218c0
Original change: https://android-review.googlesource.com/c/platform/build/+/2036932

Change-Id: Ia6f366adb9880b0c677dcc5219d7d9302e50372d
Signed-off-by: Automerger Merge Worker
2022-03-24 21:18:47 +00:00
Cole Faust
e721764192 Merge "Fix single value inheritance" 2022-03-24 20:46:33 +00:00
Android Build Coastguard Worker
e344c83b92 Version bump to SP2A.220505.002 [core/build_id.mk]
Change-Id: I16f7585f7de23caa8e039e15bc37a0d5633a92c1
2022-03-24 18:38:01 +00:00
Android Build Coastguard Worker
023d0a6875 Version bump to TP1A.220324.002 [core/build_id.mk]
Change-Id: Id808ea6fdc7476a90764c668604d7b94edcc3a1a
2022-03-24 05:40:58 +00:00
Treehugger Robot
0e9fbfd393 Merge "Support OUT_DIR for license graph." am: bc8d61f17b am: 443a7b25e3 am: f74478b33b
Original change: https://android-review.googlesource.com/c/platform/build/+/2036930

Change-Id: I18d97926c690708b1c889d8e9cabe1ee97e15382
2022-03-24 05:07:20 +00:00
Treehugger Robot
22eb25791a Merge "Revert "Rename init_boot properties to ro.init_boot.*"" am: 477b8e0561 am: 5e294a92bf am: 7895babcad
Original change: https://android-review.googlesource.com/c/platform/build/+/2039666

Change-Id: Ife828081d6040819614cd26a83a20cccbf709a2a
2022-03-24 05:02:38 +00:00
Treehugger Robot
f74478b33b Merge "Support OUT_DIR for license graph." am: bc8d61f17b am: 443a7b25e3
Original change: https://android-review.googlesource.com/c/platform/build/+/2036930

Change-Id: I305c5312b687e39f49fc6d486f15faf97c87e3db
2022-03-24 04:38:43 +00:00
Treehugger Robot
7895babcad Merge "Revert "Rename init_boot properties to ro.init_boot.*"" am: 477b8e0561 am: 5e294a92bf
Original change: https://android-review.googlesource.com/c/platform/build/+/2039666

Change-Id: If815dd2ffd3addb569cf3bf5440eb61c4be1c07f
2022-03-24 04:35:07 +00:00
Android Build Coastguard Worker
8f08ce9a35 Make change and version bump to TP1A.220324.001
Change-Id: I6d749145da2e06e0128b083bc4d776904e83e633
2022-03-24 01:20:26 +00:00
Treehugger Robot
bc8d61f17b Merge "Support OUT_DIR for license graph." 2022-03-24 00:43:58 +00:00