Commit Graph

16696 Commits

Author SHA1 Message Date
Jiyong Park 15e53ff2fe Merge "split apex.go"
am: c6e9f92cfa

Change-Id: I6631f9ca3d9a608620d140d5463983d0f729a771
2019-11-18 16:40:36 -08:00
Treehugger Robot c6e9f92cfa Merge "split apex.go" 2019-11-19 00:34:26 +00:00
Dan Willemsen f7d7ed73e7 Merge "Remove BASH_ENV from the build environment"
am: 0398cd2af4

Change-Id: Ie98ff941fab0a346101b49aebfe17ff037d087c2
2019-11-18 15:43:10 -08:00
Treehugger Robot 0398cd2af4 Merge "Remove BASH_ENV from the build environment" 2019-11-18 23:26:18 +00:00
Colin Cross bbefebaede Merge "Add more suggestions on converting Makefile conditionals"
am: 874da80729

Change-Id: Ib39c0d2ad3ec534c07cab7c116d584c7d7501a06
2019-11-18 13:06:08 -08:00
Treehugger Robot 874da80729 Merge "Add more suggestions on converting Makefile conditionals" 2019-11-18 20:02:05 +00:00
Dan Willemsen 1c504d9c7e Remove BASH_ENV from the build environment
This runs an arbitrary shell script for all non-interactive bash sessions, and we've got lots of those.

It was causing problems with Fedora 30, which triggers the `manpath` executable, which isn't available in our $PATH:
https://groups.google.com/d/msg/android-building/WqEyZQuxYtY/zDXl9irOCAAJ

Change-Id: If2f63bbbcc3accb8d239f93fa06823d301d69488
2019-11-18 19:13:56 +00:00
Jiyong Park 09d77522fe split apex.go
apex.go is too big. Separate the build rule and android.mk generation
logic into builder.go and androidmk.go, respectively. prebuilt_apex is
moved to prebuilt.go as well.

No refactoring has been made other than the splitting.

Test: m
Change-Id: I839ab0a1ba2b70ce82d98ac1fa8e3534808b5fd3
2019-11-18 16:37:06 +09:00
Sundong Ahn 1d4d5ea56b Merge "Change the partition of outputfile"
am: a3ab1a927e

Change-Id: I4ee6361ffc817ffb7aaae1f89bab9729f9d2a533
2019-11-17 19:03:36 -08:00
Treehugger Robot a3ab1a927e Merge "Change the partition of outputfile" 2019-11-18 01:43:50 +00:00
Jaewoong Jung 37b10e4c6d Merge "Add override_android_test."
am: 29883dece6

Change-Id: I7c60ba71518d3a11259d58667567832ef0c7f792
2019-11-16 19:03:31 -08:00
Treehugger Robot 29883dece6 Merge "Add override_android_test." 2019-11-17 01:14:30 +00:00
Chih-hung Hsieh 645386892c Merge "Set rust_test modules as NATIVE_TESTS"
am: 22e3f36b28

Change-Id: I0da76b62184d92acbb61fe9f633b52ff202fdd2d
2019-11-15 19:07:06 -08:00
Elliott Hughes 55950bd526 Merge "Switch to our own zipinfo(1)."
am: 7e4452511c

Change-Id: I8e0e5551a339259c603863303ae6a0085f260085
2019-11-15 19:06:33 -08:00
Chih-hung Hsieh 22e3f36b28 Merge "Set rust_test modules as NATIVE_TESTS" 2019-11-16 02:31:33 +00:00
Elliott Hughes 7e4452511c Merge "Switch to our own zipinfo(1)." 2019-11-16 00:31:45 +00:00
Colin Cross 2322c4dc9b Add more suggestions on converting Makefile conditionals
Test: none
Change-Id: I5ccf5824c6a85d881070d8e0ae16d87d3ee6cee2
2019-11-15 16:21:23 -08:00
Jaewoong Jung 7727a6d339 Add AliasVariation to BottomUpMutatorContext.
am: 9f88ce26a8

Change-Id: I820e1619c2a006eee64325a401a635c41ccb9e06
2019-11-15 16:13:43 -08:00
Jaewoong Jung 26dedd36ed Add override_android_test.
This change also adds instrumentation_target_package to android_test, so
that the target package name in a test manifest can be easily
overridden.

Fixes: 134624457
Test: app_test.go
Change-Id: Ib8dd703da0038ac76210c92d79e133e37c718122
2019-11-15 15:06:06 -08:00
Chih-Hung Hsieh 15f369e1c7 Set rust_test modules as NATIVE_TESTS
* Rust test modules should have NATIVE_TESTS class,
  not EXECUTABLES, to work with atest --host.

Bug: 140938178
Test: make rust projects; run atest --host .
Change-Id: Ie9e237ee8c17b6e2d41f08a77c2b79d462a2c193
2019-11-15 14:09:29 -08:00
Jaewoong Jung 9f88ce26a8 Add AliasVariation to BottomUpMutatorContext.
Test: TreeHugger
Change-Id: Ib9c5db8f671ed8f0742183fc533dcc582269d17a
2019-11-15 10:57:34 -08:00
Colin Cross 4b06deaeaf Merge "Set default pool when RBE or goma is enabled"
am: 409e833def

Change-Id: I4cd39f0337dd3609e42bceb1446e80bce4e383ce
2019-11-15 10:41:13 -08:00
Colin Cross 409e833def Merge "Set default pool when RBE or goma is enabled" 2019-11-15 18:19:33 +00:00
Paul Duffin 6c6e830af8 Merge "Refactor sdk update mechanism"
am: 0f568b1237

Change-Id: I03637fd9ac74fb4530cfee5946ac4e96ac45d934
2019-11-15 07:24:45 -08:00
Treehugger Robot 0f568b1237 Merge "Refactor sdk update mechanism" 2019-11-15 15:19:13 +00:00
Jiyong Park f52c9cf572 Merge "apexDepsMutator is now bottom-up mutator"
am: 19258857ef

Change-Id: I06d2cf07372ff13b7595c1ddb584e926d44343b6
2019-11-14 22:04:59 -08:00
Treehugger Robot 19258857ef Merge "apexDepsMutator is now bottom-up mutator" 2019-11-15 05:18:24 +00:00
Jiyong Park 5a0fba64dd Merge "Override apexes with LOCAL_OVERRIDES_MODULES"
am: bbdeda5bed

Change-Id: I74469fafc2d6ad501c69ca010cb3ae53ff71f38f
2019-11-14 21:09:35 -08:00
Treehugger Robot bbdeda5bed Merge "Override apexes with LOCAL_OVERRIDES_MODULES" 2019-11-15 05:02:55 +00:00
Chih-hung Hsieh c3895078b3 Merge "Add TestProperties, gen test config, fix names"
am: 8d7ae1aefe

Change-Id: Idfc40a76b49026615596cc6c43982dbb409f2490
2019-11-14 20:40:04 -08:00
Mitch Phillips ff2da83225 Merge changes Idea4f04c,I3b85ef66
am: 6dd78bdda0

Change-Id: Ibf8bef665cb318990b6a6dee70260643678c39f4
2019-11-14 20:39:25 -08:00
Chih-hung Hsieh 8d7ae1aefe Merge "Add TestProperties, gen test config, fix names" 2019-11-15 04:28:41 +00:00
Treehugger Robot 6dd78bdda0 Merge changes Idea4f04c,I3b85ef66
* changes:
  Add $$ORIGIN/lib to rpath for fuzz targets.
  Prebuilt shared libraries should be collected for fuzz targets.
2019-11-15 04:26:22 +00:00
Elliott Hughes 3efacee1fd Switch to our own zipinfo(1).
Test: treehugger
Change-Id: If71e87e45a52959be9a316810fe79250771eb9d4
2019-11-14 20:09:24 -08:00
Ivan Lozano 93916e9120 Merge "Add new module types to the rust whitelist."
am: fcc157a150

Change-Id: I386ec4143454c048db63e753d15cb68f39ca2844
2019-11-14 20:04:09 -08:00
Treehugger Robot fcc157a150 Merge "Add new module types to the rust whitelist." 2019-11-15 03:47:33 +00:00
Ivan Lozano b6eddf33c0 Merge "Allow cc modules to pull in rust includes."
am: 36396b26ef

Change-Id: I1b85968d8a104c51691ce4c7aedaac70f853926d
2019-11-14 18:42:59 -08:00
Ivan Lozano 36396b26ef Merge "Allow cc modules to pull in rust includes." 2019-11-15 02:32:26 +00:00
Jiyong Park b2876f9b3d Merge changes Ibcc1096e,I21ac2441
am: bc196606c3

Change-Id: Ieea8fdaa3bfab6720283974f3c70179e9099d5a2
2019-11-14 18:05:38 -08:00
Jiyong Park a308ea1591 apexDepsMutator is now bottom-up mutator
... in preparation for override_apex.

Bug: 144338929
Test: m
Change-Id: I6c19e384edc089fe5c8aa9bd00082178bd1a37a2
2019-11-15 10:38:39 +09:00
Treehugger Robot bc196606c3 Merge changes Ibcc1096e,I21ac2441
* changes:
  Install AndroidApp only when needed
  Reland: JNI lib is always embedded for APKs in APEX
2019-11-15 00:10:05 +00:00
Jaewoong Jung 5cc475c6d8 Merge "Create .gitignore and add /.idea there."
am: d1ee08624f

Change-Id: I30e43243121141294fdb42098710120612b51e47
2019-11-14 16:07:20 -08:00
Treehugger Robot d1ee08624f Merge "Create .gitignore and add /.idea there." 2019-11-15 00:01:05 +00:00
Chih-Hung Hsieh 41805bedbf Add TestProperties, gen test config, fix names
* Rename testBinaryDecorator to testDecorator
* Add TestProperties
  * Add install function for testDecorator to install config files
  * Add tradefed.AutoGenRustHostTestConfig
  * Depend on new build/make/core/rust_host_test_config_template.xml
    and new tradefed.testtype.rust.RustBinaryHostTest class
* Add autogenTemplateWithName in tradefed/autogen.go
  to generate config files with customized(mutated) executable name.
* Make rust_test module names more robust and easy to use.
  * Use crate name instead of source file name as the Stem
    for single source file modules, to match original user
    specified output file name in Cargo.toml.
  * Do not set up test module SubName when Stem is empty
    or when the module name already contains Stem suffix.
    That happens when TestPerSrcMutator is disabled or when
    there is only one source file with renamed output file name.
  * In TEST_MAPPING, references to mutated rust_test modules should be
    (1) <module_name> for single source file modules without mutation, or
    (2) <module_name>_<crate_name> for single source file modules, or
    (3) <module_name>_<source_file_base_name> for multi-file modules.

Bug: 140938178
Test: mm in rust projects, check output test file names
Change-Id: Ifdbfa14d5eed4f10b4fb983f82c93bbb9be3f899
2019-11-14 15:16:26 -08:00
Mitch Phillips 1f7f54f441 Add $$ORIGIN/lib to rpath for fuzz targets.
RPATH needs to be set to traverse the local directory's lib folder for
fuzz target packages.

Bug: N/A
Test: m fuzz
Change-Id: Idea4f04ce4c55315df7e808de5b2b4f06a88d82a
2019-11-14 15:08:59 -08:00
Mitch Phillips f50bddb790 Prebuilt shared libraries should be collected for fuzz targets.
Currently, prebuilt shared libraries fail the linkable.CcLibrary()
check, as the module returned by NewPrebuiltSharedLibrary uses a
prebuiltLibraryLinker as the module.linker, rather than a
libraryDecorator (which is the check by CcLibrary()).

We also need to ensure that we discard LLNDK stubs libraries, so we
manually categorise and discard them as well. They unfortunately are are
cc.Modules that aren't CcLibraries, as they use a custom linker object
as well (stubDecorator).

Fixes: 144415986
Test: m fuzz
Change-Id: I3b85ef66d1602cb8c035a0a90bddf30674e2eb71
2019-11-14 11:02:50 -08:00
Mitch Phillips 6efa5852b3 Merge "Package fuzz targets into zipfiles, then coalesce."
am: ed0070d453

Change-Id: I152c0d901af82c97a786daa03bb42754194a78fd
2019-11-14 10:48:00 -08:00
Jeffrey Vander Stoep a0a19b871c Merge changes from topic "rust-sysroot"
am: f3a2d5abc3

Change-Id: I8463603573f1a5a4572984dc8c2dea0edbf8cd60
2019-11-14 10:44:43 -08:00
Mitch Phillips ed0070d453 Merge "Package fuzz targets into zipfiles, then coalesce." 2019-11-14 18:37:48 +00:00
Jeffrey Vander Stoep f3a2d5abc3 Merge changes from topic "rust-sysroot"
* changes:
  Enable x86_64 device support
  Build Rust Device Sysroots in Soong
2019-11-14 18:28:13 +00:00