Commit Graph

16864 Commits

Author SHA1 Message Date
Ivan Lozano 0aa51a018b Merge "Add rust default compilation flags." 2019-11-21 17:45:45 +00:00
Martin Stjernholm 6be9b91b79 Merge "Reland "Recognize libdl_android as a Bionic library"."
am: d0738b3608

Change-Id: I16d4c30e5730f631450479f187087cfba6d3e513
2019-11-21 08:29:49 -08:00
Martin Stjernholm d0738b3608 Merge "Reland "Recognize libdl_android as a Bionic library"." 2019-11-21 16:17:42 +00:00
Jooyung Han 54aca7b3f3 Make 'file_contexts' prop as `android:"path"`
For platform APEXes, file_contexts should point a file under
/system/sepolicy.

Bug: 144732805
Test: m
Change-Id: Ib2d5db715bbebc80a6178d1c42e387b268cc4a0d
2019-11-21 22:05:06 +09:00
Jiyong Park ce6aadc410 apex uses the first arch variant of prebuilt_etc modules
prebult_etc module type does not respect prefer32, i.e. its primary arch
is 64-bit on 64/32-bit device even when built with TARGET_PREFER_32_BIT
is true. However, the apex module type respects prefer32 and therefore
when TARGET_PREFER_32_BIT is true its primary arch becomes 32-bit. Then
the problem is that the apex tries to depend on 32-bit variant of the
prebuilt_etc modules which don't exist.

Fixing the problem by force using the first arch of the device when
adding dependencies to prebuilt_etc modules.

Bug: 144532908
Test: choosecombo 1 aosp_arm64 userdebug; TARGET_PREFER_32_BIT=true m;
Change-Id: I7642c57b05a837495587bbe4d3589d8549607862
2019-11-21 16:16:40 +09:00
Jiyong Park 48d75efa6f symbols in stub library isn't affected by -fvisibility=hidden
Fixing the bug that -fvisibility=hidden in a cc_library is used even
when compiling stub.c file where the symbols shouldn't be hidden.

Bug: 144781653
Test: add folowing to libEGL and build
+    stubs: {
+        symbol_file: "libEGL.map.txt",
+        versions: ["29"],
+    },

Change-Id: Iab70f36a4fb98737fc35827dbc9e1ca1a99d4354
2019-11-21 15:11:49 +09:00
Colin Cross 7228ecd5e3 Move cc.imageMutator into the android package
Prepare for making the image mutator available to all modules and
moving it between the os and arch mutators by moving it into the
android package and using an interface implemented by the module
types to control it.

Bug: 142286466
Test: No unexpected changes to out/soong/build.ninja
Change-Id: I0dcc9c7b5ec80edffade340c367f6ae4da34151b
2019-11-20 15:21:32 -08:00
Ivan Lozano 31b095d071 Add rust default compilation flags.
Bug: 140725928
Test: m -j crosvm.experimental
Change-Id: I1674f099659957f024cce70341a6a69610118a69
2019-11-20 10:14:33 -08:00
Artur Satayev 352df50c64 Merge "Pass hiddenapi-greylist-max-q.txt to greylist generator."
am: b2e729d14c

Change-Id: I5d5120e0ff0d4985f6da0782317502deb58253de
2019-11-20 10:04:18 -08:00
Treehugger Robot b2e729d14c Merge "Pass hiddenapi-greylist-max-q.txt to greylist generator." 2019-11-20 17:51:55 +00:00
Jiyong Park 4bdd38a1e5 Add override_apex module type
am: 5d790c3dda

Change-Id: Ie6fbcb51bf027a71af8862efc596eee3f3cca984
2019-11-20 05:15:59 -08:00
Artur Satayev c5b4f99104 Pass hiddenapi-greylist-max-q.txt to greylist generator.
Bug: 137350495
Test: m, manual inspection of out/soong/hiddenapi/hiddenapi-flags.csv
Change-Id: I67227307ec08ab56a385980eceacaab1b985eb49
Merged-In: I67227307ec08ab56a385980eceacaab1b985eb49
2019-11-20 10:46:16 +00:00
Colin Cross 43b92e0d0f Make CreateVariations return []android.Module
Test: soong tests
Change-Id: I9bc40642c4902392eb8193bf73e32b7f1c18c14e
2019-11-19 10:33:08 -08:00
Martin Stjernholm 203489b321 Reland "Recognize libdl_android as a Bionic library".
Necessary to create the symlinks from /system/lib{,64} to the Runtime APEX.

Test: build & boot
Bug: 135753770
Bug: 144343305
Change-Id: I221bed87a85f18c927ba44ee75b7db75316c1f49
2019-11-19 16:35:47 +00:00
Jiyong Park 5d790c3dda Add override_apex module type
override_apex module type is used to override existing apex module with
certain properties overridden. Currently, only the 'apps' property is
overridable.

Bug: 144338929
Test: m
Change-Id: Ic050b062093cda29ce78126cc92dd6097647f7db
2019-11-19 16:49:36 +09:00
Jiyong Park 6ac3cac7d1 sh_binary prefer 32bit when TARGET_PREFER_32_BIT
The module type can be referenced in the 'binaries' property of an
APEX, where it is expected that the binary modules prefer 32bit arch
when the build is configured with TARGET_PREFER_32_BIT. Satisfying the
expectation by allowing the module types to use 32bit arch in the
case.

Bug: 144532908
Test: choosecombo 1 aosp_arm64 userdebug; TARGET_PREFER_32_BIT=true m;
Change-Id: I2120b40e3230aa695b4c38b850c1ea32e46cbbfb
2019-11-19 13:45:18 +09:00
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