Commit Graph

29810 Commits

Author SHA1 Message Date
Thiébaud Weksteen
8da491134a Update add3prf.py
Change the license detection logic to return if a dual-license was
found. Update the metadata comment as discussed in b/179902335.
Add unit tests for add_module_license and decide_license_type.

Bug: 179902335
Test: atest --host add3prf_test; manually run add3prf.py in {ahash,
  libloading, parking_lot, ring}
Change-Id: I3184b5cf0955d124170b9e5987308507bdef6e9a
2021-02-19 12:20:34 +01:00
Treehugger Robot
c3f4534f01 Merge "Have cargo2android put warning not to modify Android.bp files" am: 5b630e0f9f am: e40c638c41
Original change: https://android-review.googlesource.com/c/platform/development/+/1594452

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4b77167b0830b823e5a31fb19432eec7a6fdb66b
2021-02-18 22:01:20 +00:00
Treehugger Robot
e40c638c41 Merge "Have cargo2android put warning not to modify Android.bp files" am: 5b630e0f9f
Original change: https://android-review.googlesource.com/c/platform/development/+/1594452

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I896e27416d40ebb4eeb714c22ef59d86050a5f72
2021-02-18 21:22:35 +00:00
Treehugger Robot
5b630e0f9f Merge "Have cargo2android put warning not to modify Android.bp files" 2021-02-18 20:05:33 +00:00
Joel Galenson
56446748cf Have cargo2android put warning not to modify Android.bp files
Test: Run cargo2android
Test: Run upgrader script
Change-Id: Idd9fc9b8ad7a7c4fb3da954178d0221c95132fd3
2021-02-18 09:36:53 -08:00
Treehugger Robot
6bb3302afb Merge "Switch the arm64 kernel to gz" am: f36107a571 am: c1c063c305
Original change: https://android-review.googlesource.com/c/platform/development/+/1593240

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0c293e94da418815db81afbd4f862680bc362ae7
2021-02-18 06:03:01 +00:00
Treehugger Robot
c1c063c305 Merge "Switch the arm64 kernel to gz" am: f36107a571
Original change: https://android-review.googlesource.com/c/platform/development/+/1593240

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I55d7d2590920299a299522e7c3dc675e6474c480
2021-02-18 05:20:24 +00:00
Treehugger Robot
f36107a571 Merge "Switch the arm64 kernel to gz" 2021-02-18 04:39:47 +00:00
Roman Kiryanov
67cdcf3f6a Switch the arm64 kernel to gz
Bug: 180497581
Test: boot on M1
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: Ib8f745a14732c9a5ff665cc70e2ede671b253098
2021-02-17 14:53:13 -08:00
Treehugger Robot
483ddf28c8 Merge "[LSC] Add LOCAL_LICENSE_KINDS to development" am: d6b1cbf769 am: 4d108c6ffe
Original change: https://android-review.googlesource.com/c/platform/development/+/1589100

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib7afca5e0c8e8e374cab9512eb208120465f8bcc
2021-02-16 00:31:47 +00:00
Treehugger Robot
4d108c6ffe Merge "[LSC] Add LOCAL_LICENSE_KINDS to development" am: d6b1cbf769
Original change: https://android-review.googlesource.com/c/platform/development/+/1589100

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic1d125bf7c5ef4dfb8294fcfe1fec3d2719b6acb
2021-02-15 23:48:17 +00:00
Treehugger Robot
d6b1cbf769 Merge "[LSC] Add LOCAL_LICENSE_KINDS to development" 2021-02-15 23:21:47 +00:00
Bob Badour
f7cf305656 [LSC] Add LOCAL_LICENSE_KINDS to development
Added SPDX-license-identifier-Apache-2.0 to:
  apps/BluetoothDebug/Android.bp
  apps/BuildWidget/Android.bp
  apps/CustomLocale/Android.bp
  apps/DevelopmentSettings/Android.bp
  apps/Fallback/Android.bp
  apps/GestureBuilder/Android.bp
  apps/NinePatchLab/Android.bp
  apps/OBJViewer/Android.bp
  apps/PushApiAuthenticator/Android.bp
  apps/PushApiTestAppOne/Android.bp
  apps/PushApiTestAppTwo/Android.bp
  apps/SdkSetup/Android.bp
  apps/SettingInjectorSample/Android.bp
  apps/WidgetPreview/Android.bp
  apps/launchperf/Android.bp
  cmds/monkey/Android.mk
  gsi/gsi_util/Android.bp
  gsi/repack_super_image/Android.bp
  host/windows/Android.bp
  python-packages/Android.bp
  samples/AccelerometerPlay/Android.bp
  samples/AdaptiveIconSample/Android.bp
  samples/AliasActivity/Android.bp
  samples/AndroidBeamDemo/Android.bp
  samples/AppNavigation/Android.bp
  samples/AutofillKeyboard/Android.bp
  samples/BackupRestore/Android.bp
  samples/BasicGLSurfaceView/Android.bp
  samples/BluetoothChat/Android.bp
  samples/BrokenKeyDerivation/Android.bp
  samples/BrokenKeyDerivation/tests/Android.bp
  samples/BusinessCard/Android.bp
  samples/Compass/Android.bp
  samples/ContactManager/Android.bp
  samples/CubeLiveWallpaper/Android.bp
  samples/DataWiper/Android.bp
  samples/DeviceAdminWhitelistedAccount/Android.bp
  samples/FixedGridLayout/Android.bp
  samples/HeavyWeight/Android.bp
  samples/HelloActivity/Android.bp
  samples/HelloActivity/tests/Android.bp
  samples/HelloEffects/Android.bp
  samples/Home/Android.bp
  samples/HoneycombGallery/Android.bp
  samples/InlineFillService/Android.bp
  samples/JetBoy/Android.bp
  samples/LceDemo/Android.bp
  samples/LunarLander/Android.bp
  samples/LunarLander/tests/Android.bp
  samples/MultiResolution/Android.bp
  samples/MultiWindow/Android.bp
  samples/MySampleRss/Android.bp
  samples/NotePad/Android.bp
  samples/Obb/Android.bp
  samples/RSSReader/Android.bp
  samples/ReceiveShareDemo/Android.bp
  samples/SampleSyncAdapter/Android.bp
  samples/SimpleJNI/Android.bp
  samples/SimpleJNI/jni/Android.bp
  samples/SipDemo/Android.bp
  samples/SkeletonApp/Android.bp
  samples/SkeletonApp/tests/Android.bp
  samples/Snake/Android.bp
  samples/Snake/tests/Android.bp
  samples/SoftKeyboard/Android.bp
  samples/SpellChecker/HelloSpellChecker/Android.bp
  samples/SpellChecker/SampleSpellCheckerService/Android.bp
  samples/StackWidget/Android.bp
  samples/ThemedNavBarKeyboard/Android.bp
  samples/ToyVpn/Android.bp
  samples/TtsEngine/Android.bp
  samples/USB/AdbTest/Android.bp
  samples/USB/MissileLauncher/Android.bp
  samples/UiAutomator/Android.mk
  samples/Vault/Android.bp
  samples/Vault/tests/Android.bp
  samples/VoiceRecognitionService/Android.bp
  samples/VoicemailProviderDemo/Android.bp
  samples/WeatherListWidget/Android.bp
  samples/WiFiDirectDemo/Android.bp
  samples/WiFiDirectServiceDiscovery/Android.bp
  samples/Wiktionary/Android.bp
  samples/WiktionarySimple/Android.bp
  samples/XmlAdapters/Android.bp
  samples/apkcachetest/Android.bp
  samples/training/NsdChat/Android.bp
  scripts/Android.bp
  testrunner/Android.mk
  testrunner/tests/Android_native.mk
  tools/apkcheck/Android.bp
  tools/bugreport/Android.bp
  tools/etc1tool/Android.bp
  tools/idegen/Android.bp
  tools/mkstubs/Android.bp
  tools/rmtypedefs/Android.bp
  vndk/Android.bp
  vndk/tools/Android.bp
  vndk/tools/elfcheck/Android.bp
  vndk/tools/header-checker/Android.bp
  vndk/tools/header-checker/src/repr/protobuf/proto/Android.bp
  vndk/tools/header-checker/tests/integration/ifunc/Android.bp
  vndk/tools/header-checker/tests/integration/version_script_example/Android.bp
  vndk/tools/image-diff-tool/Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
    SPDX-license-identifier-CPL-1.0 SPDX-license-identifier-MIT
    SPDX-license-identifier-Unicode-DFS SPDX-license-identifier-W3C
    legacy_restricted legacy_unencumbered
to:
  Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-CPL-1.0
to:
  samples/SearchableDictionary/Android.bp

Added SPDX-license-identifier-Apache-2.0 legacy_unencumbered
to:
  tools/Android.bp

Added SPDX-license-identifier-BSD SPDX-license-identifier-CPL-1.0
    SPDX-license-identifier-MIT SPDX-license-identifier-Unicode-DFS
    SPDX-license-identifier-W3C
to:
  sdk/Android.bp

Added legacy_restricted
to:
  samples/KeyChainDemo/Android.bp
  tools/line_endings/Android.bp
  vndk/tools/definition-tool/datasets/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I9847e00fb4278bc083b4debbc751003c995ea45c
2021-02-12 17:13:45 -08:00
Jose "Pepe" Galmes
ebc06e7ad6 Merge "Implement directed recovery snapshot." am: b44c5b747c am: d2f9cd048d
Original change: https://android-review.googlesource.com/c/platform/development/+/1579217

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3ac81beb89c732c38b1c68ddd9d7b281be9fcba6
2021-02-10 01:21:47 +00:00
Jose "Pepe" Galmes
d2f9cd048d Merge "Implement directed recovery snapshot." am: b44c5b747c
Original change: https://android-review.googlesource.com/c/platform/development/+/1579217

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2ed083cd79836725f69ad43d2f2e0513ca07034f
2021-02-10 00:28:34 +00:00
Jose "Pepe" Galmes
b44c5b747c Merge "Implement directed recovery snapshot." 2021-02-10 00:02:34 +00:00
Jose Galmes
8070a1ad1e Implement directed recovery snapshot.
Bug: 177451657
Test: m -j nothing
Change-Id: I72a37ddde78951e61106cc532921ca47eed71922
2021-02-09 09:55:58 -08:00
Treehugger Robot
b108c60c9c Merge "Switch to the kernel from kernel/prebuilts" am: acffc6c796 am: f58e0181ba
Original change: https://android-review.googlesource.com/c/platform/development/+/1576367

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I068da56c1b4cac62da114010e69db2f66f108030
2021-02-05 18:28:36 +00:00
Treehugger Robot
f58e0181ba Merge "Switch to the kernel from kernel/prebuilts" am: acffc6c796
Original change: https://android-review.googlesource.com/c/platform/development/+/1576367

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I601c18dace2fb4a55b277d704864a0e15b68035a
2021-02-05 17:50:06 +00:00
Treehugger Robot
acffc6c796 Merge "Switch to the kernel from kernel/prebuilts" 2021-02-05 17:21:17 +00:00
Roman Kiryanov
cc09ceecde Switch to the kernel from kernel/prebuilts
prebuilts/qemu-kernel is deprecated.

Bug: 170677468
Test: presubmit
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: Ia56718b7bf7d719d4c9cf8d864bb1a9eb7995d82
Merged-In: Ia56718b7bf7d719d4c9cf8d864bb1a9eb7995d82
2021-02-04 14:20:28 -08:00
Treehugger Robot
be1cce0a4f Merge "update_crate_tests.py: don't use sys.exit()" am: 45b7b32f7e am: e90305e34d
Original change: https://android-review.googlesource.com/c/platform/development/+/1573245

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I701bf0197c59c35dcf85429ecf40bd722ef3267e
2021-02-04 14:24:15 +00:00
Treehugger Robot
e90305e34d Merge "update_crate_tests.py: don't use sys.exit()" am: 45b7b32f7e
Original change: https://android-review.googlesource.com/c/platform/development/+/1573245

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7c8074d6cc278aa30970813d1be80950f0150c75
2021-02-04 13:22:57 +00:00
Treehugger Robot
45b7b32f7e Merge "update_crate_tests.py: don't use sys.exit()" 2021-02-04 12:59:40 +00:00
Jeff Vander Stoep
82ee11ae77 update_crate_tests.py: don't use sys.exit()
If the TEST_MAPPING cannot be generated, print the reason, but
exit without error. It's not uncommon for the output of cargo2android
to fail to build e.g. if a new depencency is not satisfied, so we can
fall back to the previous TEST_MAPPING, or run update_crate_tests
locally once all dependencies are present.

Bug: 179132533
Test: tools/external_updater/updater.sh update rust/crates/textwrap
Test: tools/external_updater/updater.sh update rust/crates/libc
Change-Id: I4802c77332d1ab1d6604d48c47365f40bdbd1122
2021-02-04 12:10:39 +01:00
Treehugger Robot
99fa553315 Merge "update_crate_tests: fail gracefully" am: f9d75c1f5a am: 216c726555
Original change: https://android-review.googlesource.com/c/platform/development/+/1573140

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I15a1844c458ad3e335bc575e6aa88a53d0b9236f
2021-02-04 10:10:58 +00:00
Treehugger Robot
216c726555 Merge "update_crate_tests: fail gracefully" am: f9d75c1f5a
Original change: https://android-review.googlesource.com/c/platform/development/+/1573140

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I01771f97352786d13a3abb3a0c8ce53b91d49178
2021-02-04 09:48:08 +00:00
Treehugger Robot
f9d75c1f5a Merge "update_crate_tests: fail gracefully" 2021-02-04 08:39:22 +00:00
Jeff Vander Stoep
1b24dc3f71 update_crate_tests: fail gracefully
Allow this script to accept a path to the crate being updated.
This allows it to be run separately from cargo2android.

Also, fail gracefully on error. TEST_MAPPING update failures should
not block crate updates.

Test: tools/external_updater/updater.sh update rust/crates/libc
Bug: 179132533
Change-Id: I3a4229f479ab3d2793df16b470f0a0632b9ee495
2021-02-03 21:42:40 +01:00
Weilun Du
181aa286df Merge "Rename qemu.keyboard_layout to vendor.qemu.keyboard_layout" am: 9924173829 am: 46681fc0d8
Original change: https://android-review.googlesource.com/c/platform/development/+/1561419

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia40a0fdfd2a5d96a43850c6f12e7e1f5edbb7566
2021-02-02 01:24:00 +00:00
Inseob Kim
4f8ed9f2dd Merge changes from topics "snapshot_androidmk_suffix", "snapshot_list_module" am: b968be1e69 am: cffc2fa0a2
Original change: https://android-review.googlesource.com/c/platform/development/+/1563533

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic8b1c21984f4f42827b21be7c8c29ba8df616f56
2021-02-02 01:23:52 +00:00
Weilun Du
46681fc0d8 Merge "Rename qemu.keyboard_layout to vendor.qemu.keyboard_layout" am: 9924173829
Original change: https://android-review.googlesource.com/c/platform/development/+/1561419

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I60e1de679e30d0e680d3c281852ba9f82693485a
2021-02-02 00:45:57 +00:00
Inseob Kim
cffc2fa0a2 Merge changes from topics "snapshot_androidmk_suffix", "snapshot_list_module" am: b968be1e69
Original change: https://android-review.googlesource.com/c/platform/development/+/1563533

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I814be4a2501ce4777ae4bb957f0eabd538397ee2
2021-02-02 00:45:16 +00:00
Weilun Du
9924173829 Merge "Rename qemu.keyboard_layout to vendor.qemu.keyboard_layout" 2021-02-01 23:59:53 +00:00
Inseob Kim
b968be1e69 Merge changes from topics "snapshot_androidmk_suffix", "snapshot_list_module"
* changes:
  Add support to androidmk_suffix prop
  Generate snapshot list modules
2021-02-01 23:46:02 +00:00
Inseob Kim
8ab25aa5d5 Add support to androidmk_suffix prop
Bug: 177098205
Test: run script after manually editing json
Change-Id: I872234a15bf4e15d2fa980d48047091ed03f64dd
2021-02-01 10:45:17 +09:00
Inseob Kim
bfcec08eba Generate snapshot list modules
This will additionally generate {image}_snapshot module which contains
a list of vndk and snapshot libraries. This information will be used by
Soong to override source modules, and will look like:

    vendor_snapshot {
        name: "vendor_snapshot",
        version: "30",
        arch: {
            arm: {
                vndk_libs: ["libvndk", ...],
                shared_libs: ["libc++", ...],
                static_libs: ["libc++_static", ...],
                header_libs: ["libbase_headers", ...],
                binaries: ["sh.vendor", ...],
                objects: ["crtbegin_so", ...],
            },
            arm64: {
                ...
            },
            ...
        },
    }

As shared/static/header/binary/object snapshots may differ among
archtecture, they will be placed under arch properties.

Bug: 177098205
Test: run script and see results
Change-Id: I774f4a6394c0a8552be6822a9592c6511a849160
2021-02-01 10:45:15 +09:00
Jose "Pepe" Galmes
70438a3e43 Merge "Extend the update.py script to determine usage." am: 8aedba5144 am: a15eb7ee99
Original change: https://android-review.googlesource.com/c/platform/development/+/1560028

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie99d9e6e31560ee211f399ea0f70dc6bb5de764f
2021-01-29 22:34:40 +00:00
Jose "Pepe" Galmes
a15eb7ee99 Merge "Extend the update.py script to determine usage." am: 8aedba5144
Original change: https://android-review.googlesource.com/c/platform/development/+/1560028

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibc6587d2e7d9882a1ce7f6e084885ff4930556f2
2021-01-29 22:24:15 +00:00
Josh Gao
2987b19664 Merge "Increment platform-tools version to 31.0.0." am: cfacb78776 am: 58c5cdc32a
Original change: https://android-review.googlesource.com/c/platform/development/+/1564416

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If013d7774d63b9a5f24cb214943e2b7933830ad7
2021-01-29 22:22:52 +00:00
Josh Gao
58c5cdc32a Merge "Increment platform-tools version to 31.0.0." am: cfacb78776
Original change: https://android-review.googlesource.com/c/platform/development/+/1564416

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7f57c639a2a7251c049007142bfcd6683a049694
2021-01-29 21:49:33 +00:00
Jose "Pepe" Galmes
8aedba5144 Merge "Extend the update.py script to determine usage." 2021-01-29 16:05:00 +00:00
Josh Gao
cfacb78776 Merge "Increment platform-tools version to 31.0.0." 2021-01-28 23:48:38 +00:00
Josh Gao
2dc5c8aa70 Increment platform-tools version to 31.0.0.
Test: none
Change-Id: Icc76da55bb0808f0059f8d462040e7f1109a33b6
2021-01-28 15:47:16 -08:00
Bill Peckham
adf54633ad Extend the update.py script to determine usage.
After you run a build that uses the full (or any) vendor
snapshot, you can use ninja to determine which files in
the vendor snapshot contribute to a given goal, which is
generally a subset of the content of a full vendor
snapshot. This information can be fed back to the
snapshot generation process to tailor the snapshot
generation towards its expected usage.

Bug: 157967325
Test: manual test
Change-Id: I0c886d130633e2ba84e9d89ae60c1faaaf9be1c4
(cherry picked from commit 57ef5d0c6a4e8e50ee9248234da69ab810a21886)
2021-01-28 15:24:07 -08:00
Weilun Du
b7e6e532da Rename qemu.keyboard_layout to vendor.qemu.keyboard_layout
Bug: 178143857

Signed-off-by: Weilun Du <wdu@google.com>
Change-Id: I27170464b9a8301ca56bd333a3e5304b8290008e
2021-01-26 21:27:46 -08:00
Bob Badour
83a5109018 Merge "Add comment for added restriction." am: b683ca080a am: 73b9744f2c
Original change: https://android-review.googlesource.com/c/platform/development/+/1557549

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic8edd8748145f40efa6bb003bc83e5b9c3b9abc4
2021-01-27 01:36:23 +00:00
Bob Badour
73b9744f2c Merge "Add comment for added restriction." am: b683ca080a
Original change: https://android-review.googlesource.com/c/platform/development/+/1557549

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0f6ef4df8d06dd6cc27bf99503d568026c11c570
2021-01-27 01:16:48 +00:00
Bob Badour
b683ca080a Merge "Add comment for added restriction." 2021-01-27 00:55:55 +00:00
Yabin Cui
eeb2929c81 Merge "Use clang-r407598b" am: 62c54c1652 am: 03a1b4b967
Original change: https://android-review.googlesource.com/c/platform/development/+/1559809

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib13ea90dd97e18853c7020f4765e37cc3b0cf8e5
2021-01-26 17:54:36 +00:00