Commit Graph

14196 Commits

Author SHA1 Message Date
Jaewoong Jung 22dad113ce resolve merge conflicts of c40949db97 to qt-dev-plus-aosp
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I496cca8b8c1b4330d56341f12c0f151766c77980
2019-07-10 10:18:16 -07:00
Jaewoong Jung c40949db97 Merge "Improve android_app_import.dpi_variants handling."
am: 3af8661af7

Change-Id: Iafb8f55dac9caaa3acb3d6fc46f0ad8452147660
2019-07-10 09:57:24 -07:00
Jaewoong Jung 3af8661af7 Merge "Improve android_app_import.dpi_variants handling." 2019-07-10 16:39:53 +00:00
Jiyong Park a237e62db0 Don't use prebuilt_apex when TARGET_FLATTEN_APEX is set to true
am: 0a573d798f

Change-Id: I67d532961fc4584bc0d7bf3616edb3236fb1acc9
2019-07-09 20:15:23 -07:00
Jooyung Han f1b7b2fa5f Merge "Add "provide_cpp_shared_libs/uses" props to "apex"" am: db7a770509
am: 6a6f19e724

Change-Id: I9e096c0d180644cb208d0541fea73221f871803f
2019-07-09 18:43:28 -07:00
Jooyung Han 6a6f19e724 Merge "Add "provide_cpp_shared_libs/uses" props to "apex""
am: db7a770509

Change-Id: I262c97a83611beceb1094534e0b5c808cc34ae0b
2019-07-09 18:33:55 -07:00
Treehugger Robot db7a770509 Merge "Add "provide_cpp_shared_libs/uses" props to "apex"" 2019-07-10 01:12:31 +00:00
Jaewoong Jung 3e18b19442 Improve android_app_import.dpi_variants handling.
Instead of circumventing the limitation of Prebuilt implementation by
picking a source path itself, it now uses the same mechanism as
archMutator and replaces the source path in advance so that Prebuilt
always sees the corrent source path.

Because this requires the Apk field to be a string pointer, the single
source prebuilt implementation is being updated to be reflection-based.

Test: Soong unit tests, m soong_docs, TreeHugger
Change-Id: I2304f15e32d632f74f95f0d9e9bf1f75ff3e2225
2019-07-09 15:00:15 -07:00
Jaewoong Jung 40262ce527 Merge "Add sh_test_host." am: 94e90c696e
am: 54a8a8ce0c

Change-Id: Icd01f843aca323ed0bc81bcb16558b42ca0036d1
2019-07-09 11:52:40 -07:00
Jaewoong Jung 54a8a8ce0c Merge "Add sh_test_host."
am: 94e90c696e

Change-Id: Ib49dfd6120a2c4ef0ee11c0c5cd773f9702dad76
2019-07-09 11:39:31 -07:00
Jaewoong Jung 94e90c696e Merge "Add sh_test_host." 2019-07-09 18:04:49 +00:00
Pirama Arumuga Nainar 1546dd9b98 Merge changes from topic "gcov-prefix-permissions-fix" am: bc53fefd6a
am: ce09846256

Change-Id: I09a1e215e8c9f90312a775dead9712c4cd32e353
2019-07-09 09:10:29 -07:00
Pirama Arumuga Nainar 83adce3545 Refactor libprofile-extras to be added as a whole static library am: 82fe59b656
am: e3493d33a7

Change-Id: If122df401f3798ce35b75089ddf8bb4decd53d0b
2019-07-09 09:10:24 -07:00
Pirama Arumuga Nainar ce09846256 Merge changes from topic "gcov-prefix-permissions-fix"
am: bc53fefd6a

Change-Id: I9c4a91abd6e114abedbfb6e0916678cab2da2d6c
2019-07-09 08:57:21 -07:00
Pirama Arumuga Nainar e3493d33a7 Refactor libprofile-extras to be added as a whole static library
am: 82fe59b656

Change-Id: Idfa4b3fdbf4f7ffa461652464c557aa5dc44e523
2019-07-09 08:57:15 -07:00
Pirama Arumuga Nainar bc53fefd6a Merge changes from topic "gcov-prefix-permissions-fix"
* changes:
  Wrap getenv when linking a coverage-enabled binary
  Refactor libprofile-extras to be added as a whole static library
2019-07-09 15:32:48 +00:00
Jooyung Han 5c998b9ff8 Add "provide_cpp_shared_libs/uses" props to "apex"
For APEXes to share C++ native libraries, we need a new kind of depedency
between APEXes: "providing" APEXes and "using" APEXes. To reflect this
dependency two new properties are added.

provide_cpp_shared_libs: bool
  this indicates that the current APEX module provides the native C++ shared
  libs to other APEXes.

uses: []string
  this indicates that the current APEX module uses the native C++ shared
  libraries from APEXes listed.

With these two, "using" APEXes can omit shared libraries in its APEX
bundle and use them from the "providing" APEXes.

Note that without corresponding changes in ld.config.txt, this won't
work.(The linker namespaces should be configured so that user APEX can
access provided libs.)

Bug: 136975105
Test: m nothing (this will trigger soong's test)
Change-Id: Iec6f9f67bcbde01145acc383f862ba21c8197536
2019-07-09 21:30:45 +09:00
Justin Yun 19603108db Rename product_services to system_ext am: d5f6c8261a
am: 9321804a11

Change-Id: I40269ec86865e8f9f1dd8f3d59d18419fde9b66e
2019-07-09 02:25:30 -07:00
Justin Yun 9321804a11 Rename product_services to system_ext
am: d5f6c8261a

Change-Id: Ifd77d7d729addae59b2b26a8cbdd2ebefffcabae
2019-07-09 02:14:59 -07:00
Justin Yun d5f6c8261a Rename product_services to system_ext
Bug: 134359158
Test: build and check if system_ext.img is created
Change-Id: Ice3229baf97a94c24a6eea22e7d4571941d7f843
2019-07-09 08:57:05 +00:00
Colin Cross 234de2aaae Move RuleBuilder on top of strings.Builder am: cfec40c41b
am: 781511c606

Change-Id: I814edfb8d41dd43b4c1d1693b035cb0fb6664096
2019-07-08 22:14:06 -07:00
Colin Cross 781511c606 Move RuleBuilder on top of strings.Builder
am: cfec40c41b

Change-Id: Ib72df28ae54e5889b0b01c66f8b5bd9914df20cf
2019-07-08 22:05:07 -07:00
Colin Cross cfec40c41b Move RuleBuilder on top of strings.Builder
strings.Builder avoids copying the final byte array to a string by
using unsafe to point the string to the backing array of the byte
slice.

Test: rule_builder_test.go
Change-Id: I3d9a70fb62f8542650cd9ebc65397297bba12585
2019-07-09 04:46:12 +00:00
Martin Stjernholm 605e18c806 Merge "Document how properties work in defaults modules." am: 188236ff23
am: 3b2542d1db

Change-Id: I4e81eeab8ad85cc686cdbeb124677070b45ad226
2019-07-08 20:11:52 -07:00
Martin Stjernholm 3b2542d1db Merge "Document how properties work in defaults modules."
am: 188236ff23

Change-Id: Ie2f093dc2c16c024b81448e53e5d103b1932f02e
2019-07-08 20:02:51 -07:00
Treehugger Robot 188236ff23 Merge "Document how properties work in defaults modules." 2019-07-09 02:25:36 +00:00
Inseob Kim 3997da917a Merge "[trivial] Remove dead code" am: fccc52f46b
am: f23a2bfa6f

Change-Id: Ied488003241580d74f1f614bf85f8b1e3fc262a6
2019-07-08 17:43:19 -07:00
Jaewoong Jung ea3863fae9 Merge "Dist NOTICE outputs for app targets." am: b1907ee587
am: f0cb835ebf

Change-Id: Iab0ed9e76c4ca820ae081a765efa4aa84ed4a903
2019-07-08 17:36:50 -07:00
Inseob Kim f23a2bfa6f Merge "[trivial] Remove dead code"
am: fccc52f46b

Change-Id: Ieac00d1f29b5077836e68748f2e2e41df17315ec
2019-07-08 17:27:49 -07:00
Jaewoong Jung f0cb835ebf Merge "Dist NOTICE outputs for app targets."
am: b1907ee587

Change-Id: I3f33053028a9564d42b9ce2b18fdfa5ff8a760c8
2019-07-08 17:12:15 -07:00
Treehugger Robot fccc52f46b Merge "[trivial] Remove dead code" 2019-07-08 23:45:23 +00:00
Jaewoong Jung b1907ee587 Merge "Dist NOTICE outputs for app targets." 2019-07-08 23:28:13 +00:00
Jaewoong Jung 61a83681c4 Add sh_test_host.
Fixes: 136272143
Test: sh_binary_test.go
Change-Id: I2e6580286fcdf43ab20020fcd147648a3009aa9f
2019-07-08 14:53:52 -07:00
Jaewoong Jung 9877279855 Dist NOTICE outputs for app targets.
Bug: 136501164
Test: m NetworkStack, TreeHugger
Change-Id: I2279eeb0e50b1b5685e23130a8da6ab090f37f56
2019-07-08 09:26:02 -07:00
Roland Levillain c1bae1bfad Add support for tests in APEX test modules. am: 630846d244
am: 1b0106341c

Change-Id: I2bded89145199371582ec84fa49d353986fc53ce
2019-07-08 04:27:43 -07:00
Roland Levillain 1b0106341c Add support for tests in APEX test modules.
am: 630846d244

Change-Id: I2b5e52b5a5330409cd2c88160d86e8494a79d31d
2019-07-08 04:18:43 -07:00
Jiyong Park 0a573d798f Don't use prebuilt_apex when TARGET_FLATTEN_APEX is set to true
When the device does not support non-flattened APEX (i.e.
TARGET_FLATTEN_APEX is set to true), then ignore the prebuilt_apex
modules even when `prefer: true`.

Bug: 136251130
Bug: 136662772
Test: build marlin, and check if /system/apex has flattened APEXes
Change-Id: I9f3dfefc3bd357d6750fbb1e418937d095720b04
2019-07-07 13:57:10 +09:00
Roland Levillain 630846d244 Add support for tests in APEX test modules.
Allow `tests` property in `apex_test` Soong modules.

Test: m (`apex/apex_test.go` amended)
Bug: 129534335
Change-Id: Ieeff7cf0980a7c394409632b6448102f59bceb3d
2019-07-05 19:01:18 +01:00
Colin Cross dc3eddd02c Merge changes Icfc893c8,I40f03fc0 am: f67e1bee4a
am: cd48600321

Change-Id: Iea2f58715a955313974a5fbcc153e9c270251e23
2019-07-03 23:06:07 -07:00
Colin Cross cd48600321 Merge changes Icfc893c8,I40f03fc0
am: f67e1bee4a

Change-Id: I0b9cf1e3df4ef7ef46e73a5dc6d363fe918c29b7
2019-07-03 22:55:03 -07:00
Inseob Kim 0ce291ebee [trivial] Remove dead code
Bug: N/A
Test: m
Change-Id: Ia278008249f5fc1cf5fd7d29e55e2e54f1d6f3ca
2019-07-04 14:39:22 +09:00
Colin Cross 30c42198df Merge "Add a String() method to android.Module" am: eee5a41aa4
am: 1af102a9f8

Change-Id: I415fe0eb785dcb7a92e80367a183cefb2659a74b
2019-07-03 20:42:01 -07:00
Treehugger Robot f67e1bee4a Merge changes Icfc893c8,I40f03fc0
* changes:
  Allow debugging with SOONG_DELVE=<listen addr>
  Print ninja stdout live during the build
2019-07-04 03:34:22 +00:00
Colin Cross efbe2716b4 Merge changes from topic "mutator_name" am: 28d36cacc1
am: 6e9bf6f1d7

Change-Id: Ia8cb796706507ca36a277e7e1aae01089b35a170
2019-07-03 20:09:38 -07:00
Patrice Arruda 25d063436d soong_ui: Build under a path that contains a symbolic link. am: baba9a9be6
am: 63469b3114

Change-Id: I69aeedbcb275d5c2a08a61831b68008f27beaa3f
2019-07-03 20:09:13 -07:00
Colin Cross 1af102a9f8 Merge "Add a String() method to android.Module"
am: eee5a41aa4

Change-Id: I15cc3b5dace326948c6a17d51d2d9a69a7302b9b
2019-07-03 20:07:49 -07:00
Treehugger Robot eee5a41aa4 Merge "Add a String() method to android.Module" 2019-07-04 02:15:35 +00:00
Colin Cross 6e9bf6f1d7 Merge changes from topic "mutator_name"
am: 28d36cacc1

Change-Id: I5d4290229fd785f02d4a14c4c91329267f7a7283
2019-07-03 19:11:35 -07:00
Patrice Arruda 63469b3114 soong_ui: Build under a path that contains a symbolic link.
am: baba9a9be6

Change-Id: Id003f390a022cb229fb9f56fb30e83d8310d7ba6
2019-07-03 19:08:13 -07:00
Treehugger Robot 28d36cacc1 Merge changes from topic "mutator_name"
* changes:
  Add MutatorName to mutator contexts
  Remove ioutil.TempDir from each android/soong/android test
2019-07-04 01:44:23 +00:00