Anton Hansson
3a951869de
Merge "Set PRODUCT_SHIPPING_API_LEVEL in module_*" am: e6c0eee673
am: 8b5677a3f0
am: c4477b5dec
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1679348
Change-Id: I79db70dd014da74bd0cad35edacf0d7372b625b7
2021-04-21 15:46:51 +00:00
Anton Hansson
c4477b5dec
Merge "Set PRODUCT_SHIPPING_API_LEVEL in module_*" am: e6c0eee673
am: 8b5677a3f0
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1679348
Change-Id: Ic872da7e2349d0c47c56cea554ffe84967d3ccec
2021-04-21 15:20:05 +00:00
Anton Hansson
8b5677a3f0
Merge "Set PRODUCT_SHIPPING_API_LEVEL in module_*" am: e6c0eee673
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1679348
Change-Id: Iaf3d9875efe272ef523fe9f38776121239eb8326
2021-04-21 14:57:02 +00:00
Anton Hansson
8454b6eb5c
Merge "Enable CFI for media module paths in module_*" am: e50287e1b5
am: 9e3c0982e7
am: 24df70f1ae
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1679347
Change-Id: I80e94d47e55c03f615b8c1709671b08776a646f6
2021-04-21 14:47:04 +00:00
Anton Hansson
e6c0eee673
Merge "Set PRODUCT_SHIPPING_API_LEVEL in module_*"
2021-04-21 14:32:15 +00:00
Anton Hansson
d0871073ab
Set PRODUCT_SHIPPING_API_LEVEL in module_*
...
This setting doesn't really make sense for unbundled builds but does
have the side-effect of turning on "full treble", which in turn is used
by some modules (libhidlbase) to conditionally use some particular -D
when compiling. The media.swcodec does not work without this define.
Bug: 185759877
Bug: 185789027
Test: compare media.swcodec apex build with module_arm64 and aosp_arm64
Change-Id: I1ebeb5f37816d8576a00ab7553cb4e9e1cab8cfa
2021-04-21 14:31:47 +00:00
Anton Hansson
24df70f1ae
Merge "Enable CFI for media module paths in module_*" am: e50287e1b5
am: 9e3c0982e7
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1679347
Change-Id: Ic0b44fab5014abd7061660336e47d20570295914
2021-04-21 14:18:04 +00:00
Anton Hansson
9e3c0982e7
Merge "Enable CFI for media module paths in module_*" am: e50287e1b5
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1679347
Change-Id: I191fb0f6f3d61b28ff9937cd439753614fe01460
2021-04-21 13:53:25 +00:00
Anton Hansson
e50287e1b5
Merge "Enable CFI for media module paths in module_*"
2021-04-21 13:29:59 +00:00
Anton Hansson
f7ac2d31d4
Enable CFI for media module paths in module_*
...
This is a step on the way to make module_arm64 to produce the same
artifacts as aosp_arm64 when building unbundled modules.
Bug: 185765252
Bug: 185789027
Test: compare media.swcodec apex build with module_arm64 and aosp_arm64
Change-Id: I50d29c1d57849fd915dc771bb8e9f028fbe8efcd
2021-04-21 10:19:28 +01:00
Treehugger Robot
121479acb3
Merge "Performs basic APEX validation in the merged target files package." am: 50a00289ea
am: f44effaaa5
am: 7fb15eb21c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1676424
Change-Id: Ibf754fee03f898156422c118d9b27ad77ffe1cf7
2021-04-21 00:54:19 +00:00
Treehugger Robot
7fb15eb21c
Merge "Performs basic APEX validation in the merged target files package." am: 50a00289ea
am: f44effaaa5
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1676424
Change-Id: Ic28a3fd29989b6785108326933998750ca34fc9f
2021-04-21 00:28:18 +00:00
Treehugger Robot
f44effaaa5
Merge "Performs basic APEX validation in the merged target files package." am: 50a00289ea
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1676424
Change-Id: I6b7323787148b183e32387c129bf9d63eed78ca9
2021-04-20 23:53:06 +00:00
Treehugger Robot
50a00289ea
Merge "Performs basic APEX validation in the merged target files package."
2021-04-20 23:32:31 +00:00
Treehugger Robot
9c612a36eb
Merge "Test changes for build support for test jni_libs" am: f3162034ef
am: bcc08a2454
am: ab9ffa8fed
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1680149
Change-Id: Idda39045f8a58b6abe55b09e2ca934643b4603af
2021-04-20 13:47:58 +00:00
Treehugger Robot
ab9ffa8fed
Merge "Test changes for build support for test jni_libs" am: f3162034ef
am: bcc08a2454
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1680149
Change-Id: Ia803969654c14c653c2c4f439d9a725c217f7e1b
2021-04-20 13:20:58 +00:00
Treehugger Robot
bcc08a2454
Merge "Test changes for build support for test jni_libs" am: f3162034ef
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1680149
Change-Id: If8fdc985ad1fe4a1c0a0f1fe3b593c6b18f34676
2021-04-20 12:58:09 +00:00
Martin Stjernholm
ea5b041dcf
Merge "Allow selecting a different product in banchan." am: 215596dd59
am: 818ba93565
am: a8d93205d3
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1675830
Change-Id: Id067069cdcf92602eb2118359336dd560eb55368
2021-04-20 12:33:41 +00:00
Treehugger Robot
f3162034ef
Merge "Test changes for build support for test jni_libs"
2021-04-20 12:26:30 +00:00
Martin Stjernholm
a8d93205d3
Merge "Allow selecting a different product in banchan." am: 215596dd59
am: 818ba93565
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1675830
Change-Id: Ic954dfc3a9ece012439e50b7de8bb972b5cfe80b
2021-04-20 12:00:58 +00:00
Martin Stjernholm
818ba93565
Merge "Allow selecting a different product in banchan." am: 215596dd59
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1675830
Change-Id: I1e7c7b6449e3b367394b3c6c09997251c3a1bf24
2021-04-20 11:36:24 +00:00
Martin Stjernholm
215596dd59
Merge "Allow selecting a different product in banchan."
2021-04-20 11:22:00 +00:00
Treehugger Robot
e52d2e5dbd
Merge "Rename ro.product.enforce_debugfs_restrictions" am: 228ef5f05f
am: a74fbc00a0
am: 16a42ccf08
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1676369
Change-Id: I7df1d7b81485aea822a8fdb5bc7adb78bb73ccc9
2021-04-20 07:29:53 +00:00
Treehugger Robot
16a42ccf08
Merge "Rename ro.product.enforce_debugfs_restrictions" am: 228ef5f05f
am: a74fbc00a0
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1676369
Change-Id: I3480132f93acdc8ed2997c23fbf089c65a13d8dd
2021-04-20 06:57:04 +00:00
Treehugger Robot
a74fbc00a0
Merge "Rename ro.product.enforce_debugfs_restrictions" am: 228ef5f05f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1676369
Change-Id: Ia56f89b173d19c7797f8b3b94a24da76e5eaff0f
2021-04-20 06:32:21 +00:00
Treehugger Robot
228ef5f05f
Merge "Rename ro.product.enforce_debugfs_restrictions"
2021-04-20 06:07:53 +00:00
Treehugger Robot
279ff055a7
Merge "Only allow LOCAL_IS_UNIT_TEST set to ALL_MODULES if defined." am: 66321c193b
am: 759af2af07
am: 0a0ebf40a9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1679525
Change-Id: I89dd7773cf3af6ac8e8338454d55253192783e27
2021-04-20 04:00:09 +00:00
Daniel Cardenas
68984aa93a
Test changes for build support for test jni_libs
...
Tested with patches: aosp/1560314 aosp/1560314/
Bug: 176593487
Test: make tvts aapt
Change-Id: I2a2867726cc39758dfb27a0a12867e20e4af56d7
2021-04-19 20:48:02 -07:00
Treehugger Robot
0a0ebf40a9
Merge "Only allow LOCAL_IS_UNIT_TEST set to ALL_MODULES if defined." am: 66321c193b
am: 759af2af07
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1679525
Change-Id: I966d1ace2845b1a4cdb94d9aa4f1d4bc70b8b7ac
2021-04-20 03:18:50 +00:00
Treehugger Robot
759af2af07
Merge "Only allow LOCAL_IS_UNIT_TEST set to ALL_MODULES if defined." am: 66321c193b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1679525
Change-Id: Ie3d20ba6ed9ce95933c3c10257f38e2c4f03572d
2021-04-20 02:52:53 +00:00
Treehugger Robot
66321c193b
Merge "Only allow LOCAL_IS_UNIT_TEST set to ALL_MODULES if defined."
2021-04-20 01:16:45 +00:00
Treehugger Robot
5e0a235465
Merge "Allow PRODUCT_CFI_INCLUDE_PATHS to work with 32-bit builds" am: b4863637a2
am: cb760624f0
am: 538d4135dc
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1675585
Change-Id: I1294cf6838fb8630c01288c89b2f1ea486fcc358
2021-04-20 00:13:58 +00:00
Treehugger Robot
538d4135dc
Merge "Allow PRODUCT_CFI_INCLUDE_PATHS to work with 32-bit builds" am: b4863637a2
am: cb760624f0
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1675585
Change-Id: Ie043b2c3080f32dc8b33cf9e3f68953e21c39fad
2021-04-19 23:38:55 +00:00
Treehugger Robot
cb760624f0
Merge "Allow PRODUCT_CFI_INCLUDE_PATHS to work with 32-bit builds" am: b4863637a2
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1675585
Change-Id: I699ebfa811402ded0e5e7db350983696f70856fa
2021-04-19 23:17:34 +00:00
Treehugger Robot
b4863637a2
Merge "Allow PRODUCT_CFI_INCLUDE_PATHS to work with 32-bit builds"
2021-04-19 23:00:57 +00:00
Daniel Norman
e9af70ad68
Performs basic APEX validation in the merged target files package.
...
Uses apex_utils.GetApexInfoFromTargetFiles to find and parse APEX files
in the target files partition dirs. Raises an error on failure to parse
or duplicate package names.
Bug: 177225446
Test: releasetools_test
Test: Create a merged build that provides the VNDK APEX on both vendor
and system. Observe failure.
Change-Id: I1356e263b7b32d6063129e079f3ba7ab4ff132a7
2021-04-19 22:31:01 +00:00
Treehugger Robot
a469693687
Merge "envsetup: fix indent" am: 9dbecd650f
am: c4927f6789
am: a919d1d457
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1679546
Change-Id: Iea3b4b4422d04df96736ebfbd67bc9ac302b1518
2021-04-19 20:35:37 +00:00
Treehugger Robot
a919d1d457
Merge "envsetup: fix indent" am: 9dbecd650f
am: c4927f6789
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1679546
Change-Id: Id8faca89239df67d15c9cdbf58decfbb6aa6c23b
2021-04-19 20:10:40 +00:00
Treehugger Robot
c4927f6789
Merge "envsetup: fix indent" am: 9dbecd650f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1679546
Change-Id: If019e06cf6b1462a10dbde541a22b6c3f937ee5e
2021-04-19 19:24:03 +00:00
Treehugger Robot
9dbecd650f
Merge "envsetup: fix indent"
2021-04-19 18:16:08 +00:00
Hridya Valsaraju
31b2e3e388
Rename ro.product.enforce_debugfs_restrictions
...
Rename ro.product.enforce_debugfs_restrictions appropriately to
ro.product.debugfs_restrictions.enabled as per the sysprop naming
scheme.
Test: build, boot
Bug: 184381659
Change-Id: I65265098caf6382583aa53811f1b3330e58141c0
2021-04-19 17:41:25 +00:00
Martin Stjernholm
2b8d923a09
Allow selecting a different product in banchan.
...
Necessary since the products used for APEX modules are different in
internal builds.
Test: banchan com.android.art
Test: banchan com.android.art arm
Test: banchan com.android.art art_module_arm
Test: banchan com.android.art module_arm
Test: banchan com.android.art x86_64
Test: banchan com.android.art art_module_x86_64
Bug: 179779520
Change-Id: Ib59a86b70e409537aaad7258465b6874b589b858
2021-04-19 18:32:00 +01:00
Timi
0469c3f91c
envsetup: fix indent
...
Test: . build/envsetup.sh
Change-Id: I829dafc707dc02d5a31899a784f88a367ec95e94
Signed-off-by: Timi <timi.rautamaki@gmail.com >
2021-04-19 17:07:53 +02:00
yangbill
877586c8c8
Only allow LOCAL_IS_UNIT_TEST set to ALL_MODULES if defined.
...
To prevent the argument be cleaned if the same module name with
different unit_test value, treat it as unit test if one of the module is
treated as unit tests.
Bug: 176096135
Test: m out/target/product/generic/module-info.json
Change-Id: Iee4ee1063d47dcba1aaf915ec9e4e56f8c7df787
2021-04-19 20:34:07 +08:00
Treehugger Robot
fdba9728a0
Merge "Re-raise exceptions instead of sys.exit" am: 2c80511bd6
am: 9c111c7dc5
am: 85c7869133
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1677725
Change-Id: Ib5e891a30bbd65a9c94ba186e7ccbef1311983ee
2021-04-17 10:33:21 +00:00
Treehugger Robot
85c7869133
Merge "Re-raise exceptions instead of sys.exit" am: 2c80511bd6
am: 9c111c7dc5
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1677725
Change-Id: I1cd881e3b38ffac48539318e7f039cd4de6363bf
2021-04-17 10:08:32 +00:00
Treehugger Robot
9c111c7dc5
Merge "Re-raise exceptions instead of sys.exit" am: 2c80511bd6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1677725
Change-Id: Iaa6a7872ff44a53fc34dd12b6b8e57ff55f47381
2021-04-17 09:24:29 +00:00
Treehugger Robot
2c80511bd6
Merge "Re-raise exceptions instead of sys.exit"
2021-04-17 08:54:19 +00:00
Kelvin Zhang
66ed06fb29
Re-raise exceptions instead of sys.exit
...
If we call sys.exit(), code in finally block won't be executed.
Test: th
Change-Id: I1f743c9385218742def3b925427942cb1d5bd031
2021-04-16 19:06:00 -04:00
Colin Cross
79213b8be4
Merge "Do not run "mkdir ./" in codebase root directly" am: 06b891d2bd
am: eb325a8841
am: adb57257a3
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1675586
Change-Id: I2fc256f1debd4256c2393a2a5c4e69573b994fdd
2021-04-16 21:40:47 +00:00