Commit graph

14895 commits

Author SHA1 Message Date
Jooyung Han
bdfa30fb48 Merge changes from topic "put-dep-in-apex" am: d62b4af8b7 am: 3873fcd58d am: f0a033b18b
am: ed91f244e9

Change-Id: Ifb2c80b713e695b175057de05736fe5a799dc504
2019-08-05 17:53:49 -07:00
Jooyung Han
3d5cd21118 Put dependency in apex_manifest.json am: e16330393a am: 3c6423ef1a am: 4d34c5b39a
am: 1de628a7aa

Change-Id: I6aa20c4c77d6450e84c5abe9bb7bf38e7d82a8f6
2019-08-05 17:53:43 -07:00
Jooyung Han
ed91f244e9 Merge changes from topic "put-dep-in-apex" am: d62b4af8b7 am: 3873fcd58d
am: f0a033b18b

Change-Id: I31ff7580b7d059f01348b3c45a1b067e3b703b33
2019-08-05 17:45:59 -07:00
Jooyung Han
1de628a7aa Put dependency in apex_manifest.json am: e16330393a am: 3c6423ef1a
am: 4d34c5b39a

Change-Id: Ib74361106b8631b220a0bae04d50b5bce5733430
2019-08-05 17:45:53 -07:00
Jooyung Han
f0a033b18b Merge changes from topic "put-dep-in-apex" am: d62b4af8b7
am: 3873fcd58d

Change-Id: Ie4895c671eee6264cbc2eb672efc314358b77017
2019-08-05 17:39:53 -07:00
Jooyung Han
4d34c5b39a Put dependency in apex_manifest.json am: e16330393a
am: 3c6423ef1a

Change-Id: I2890b9949ba79f996f4a01a0be046f3961a36b51
2019-08-05 17:39:48 -07:00
Jooyung Han
3873fcd58d Merge changes from topic "put-dep-in-apex"
am: d62b4af8b7

Change-Id: Ie21cdc47015a8870a915b2bcc5e49c08f4578da4
2019-08-05 17:34:05 -07:00
Jooyung Han
3c6423ef1a Put dependency in apex_manifest.json
am: e16330393a

Change-Id: I1090b2cc5154e7fefb1a16655ac874799fab740f
2019-08-05 17:33:57 -07:00
Treehugger Robot
d62b4af8b7 Merge changes from topic "put-dep-in-apex"
* changes:
  Add jsonmodify tool
  Put dependency in apex_manifest.json
2019-08-06 00:21:11 +00:00
yidong.zhang
8bdc4102ef Merge "Fix recovery-variant VNDK libs miss-installed to recovery img" am: 52644cb29a am: 263802ebda am: 371955973a
am: cd40569204

Change-Id: I181e68554baba9f4c6e3953b6a219c20a76ea0a7
2019-08-05 15:40:51 -07:00
yidong.zhang
cd40569204 Merge "Fix recovery-variant VNDK libs miss-installed to recovery img" am: 52644cb29a am: 263802ebda
am: 371955973a

Change-Id: I44201cdf364d527747fd1f165c28827c28f5250a
2019-08-05 15:33:50 -07:00
yidong.zhang
371955973a Merge "Fix recovery-variant VNDK libs miss-installed to recovery img" am: 52644cb29a
am: 263802ebda

Change-Id: I05793d99bc132012cbd74aebdb695b3f6d108ccf
2019-08-05 15:26:51 -07:00
yidong.zhang
263802ebda Merge "Fix recovery-variant VNDK libs miss-installed to recovery img"
am: 52644cb29a

Change-Id: I05db8d67248c11dce6a04d90ae53705ddc3f9228
2019-08-05 15:20:49 -07:00
Treehugger Robot
52644cb29a Merge "Fix recovery-variant VNDK libs miss-installed to recovery img" 2019-08-05 22:02:46 +00:00
Mitch Phillips
5759698e6d Merge "Disable LTO when building with fuzzer support." am: df7d2cc9f8 am: cead9bad66 am: 35cabd5d34
am: 2aed7136c4

Change-Id: I52998341dffc49e2d5733b50976c7b2dc3d0dea9
2019-08-05 12:09:25 -07:00
Kun Niu
a353e3f9a3 Merge "Build module from source branch instead of using prebuilds when coverage is enabled." am: a535be6012 am: fb6a70e5a1 am: de90ab86fa
am: 4d7c7994a7

Change-Id: I920395f0a067d91b0a3566700af5edcbc247ace6
2019-08-05 12:08:58 -07:00
Mitch Phillips
2aed7136c4 Merge "Disable LTO when building with fuzzer support." am: df7d2cc9f8 am: cead9bad66
am: 35cabd5d34

Change-Id: I3c9a2fcb6dd762c65cb3887f5c7e3d79aab3ff9d
2019-08-05 12:00:27 -07:00
Kun Niu
4d7c7994a7 Merge "Build module from source branch instead of using prebuilds when coverage is enabled." am: a535be6012 am: fb6a70e5a1
am: de90ab86fa

Change-Id: I014b70798d4f6d7764663002e9a94e6211301de3
2019-08-05 12:00:01 -07:00
Mitch Phillips
35cabd5d34 Merge "Disable LTO when building with fuzzer support." am: df7d2cc9f8
am: cead9bad66

Change-Id: I2a20c069093dc67f65bedb5dca905c4706d8a163
2019-08-05 11:49:31 -07:00
Kun Niu
de90ab86fa Merge "Build module from source branch instead of using prebuilds when coverage is enabled." am: a535be6012
am: fb6a70e5a1

Change-Id: Id7426f8bf7db4a9ba173a2e073c964f03b451b25
2019-08-05 11:48:58 -07:00
Mitch Phillips
cead9bad66 Merge "Disable LTO when building with fuzzer support."
am: df7d2cc9f8

Change-Id: Ie4f0e1c6266cca662c4eb133ce2bd9ce85b1dcd9
2019-08-05 11:39:28 -07:00
Kun Niu
fb6a70e5a1 Merge "Build module from source branch instead of using prebuilds when coverage is enabled."
am: a535be6012

Change-Id: Ia5f294ceec3d15f7455792a91eef1330e0131f4f
2019-08-05 11:38:53 -07:00
Mitch Phillips
df7d2cc9f8 Merge "Disable LTO when building with fuzzer support." 2019-08-05 18:18:51 +00:00
Kun Niu
a535be6012 Merge "Build module from source branch instead of using prebuilds when coverage is enabled." 2019-08-05 18:04:49 +00:00
Mitch Phillips
34b493fec5 Disable LTO when building with fuzzer support.
Bug: 131771163

LTO is currently broken when building with SANITIZE_TARGET=fuzzer. The
compiler bug is currently being addressed upstream (see linked bug), but
we have applied a local workaround in the build system to disable LTO
when building using the fuzzer config.

There is a bug here however. In the sanitizer mutator we explicitly
remove -flto and add -fno-lto. The sanitizer mutator runs after the LTO
mutator, so (in general) this works just fine. The problem exists when a
target specifies an explicit 'lto: { ... }' flag in their Android.bp. In
this case, the sanitizer mutator disables LTO, then the flags are parsed
from the Android.bp, re-enabling LTO.

This patch fixes this issue. If the sanitizer mutator has added the
-fsanitize=fuzzer-no-link flags, then the LTO mutator won't add the LTO
flags after this fact.

Test: Build a target with SANITIZE_TARGET=fuzzer (or a cc_fuzz target),
where there is an explitiy 'lto: { ... }' and watch it now succeed in
building.

Change-Id: I6643909417f666539c23469816926b806e204b06
2019-08-02 16:57:55 -07:00
Kun Niu
10c9f83f26 Build module from source branch instead of using prebuilds when coverage is enabled.
Test: successfully get coverage data from coverage build.
Bug: 137865099
Change-Id: I7df96c2b2c2ec2859393fb2c19ffe1081d112c96
2019-08-02 10:13:46 -07:00
yidong.zhang
d06ecc8af1 Fix recovery-variant VNDK libs miss-installed to recovery img
When no-vendor-variant VNDK is enabled,the vendor variant of VNDK
libraries are not installed.This should not be fit for recovery module.
Recovery module deps should be always installed.

Bug: 138812833
Test: `adb reboot recovery;` recovery mode boot ok

Change-Id: I0c3b8ac0fb0176677ddd94ba7216dd068f2eb81b
2019-08-02 16:24:15 +08:00
Dan Willemsen
40cd519ef5 Merge "Remove support for ONE_SHOT_MAKEFILE" am: d778b93168 am: 57d5786d59 am: cf7003d934
am: b56717da3b

Change-Id: Iea3f7fddd401d241f9b57f8694e196c9dff5263a
2019-08-01 15:07:00 -07:00
Dan Willemsen
b56717da3b Merge "Remove support for ONE_SHOT_MAKEFILE" am: d778b93168 am: 57d5786d59
am: cf7003d934

Change-Id: Ied8abe2c8937d4d50051fa07087c522b54241628
2019-08-01 14:52:54 -07:00
Dan Willemsen
cf7003d934 Merge "Remove support for ONE_SHOT_MAKEFILE" am: d778b93168
am: 57d5786d59

Change-Id: I304172e050d4c4fc5505f822f9159542bf9e688d
2019-08-01 14:41:54 -07:00
Dan Willemsen
57d5786d59 Merge "Remove support for ONE_SHOT_MAKEFILE"
am: d778b93168

Change-Id: I32ef15cf94df3524e4e805327d4af246c95226a6
2019-08-01 14:31:53 -07:00
Dan Willemsen
d778b93168 Merge "Remove support for ONE_SHOT_MAKEFILE" 2019-08-01 21:11:02 +00:00
Elliott Hughes
9fb16280df Merge "Reland "Remove product_is_iot."" am: 80e071d1da am: 4177df9567 am: 2ad30002d5
am: 567cde69a8

Change-Id: Id714a3d002f493d9cb46a3ca51a4944221393861
2019-08-01 12:35:54 -07:00
Elliott Hughes
567cde69a8 Merge "Reland "Remove product_is_iot."" am: 80e071d1da am: 4177df9567
am: 2ad30002d5

Change-Id: Iedcca3dfeb28372a1208513c786f186cffbbcd7f
2019-08-01 12:22:46 -07:00
Elliott Hughes
2ad30002d5 Merge "Reland "Remove product_is_iot."" am: 80e071d1da
am: 4177df9567

Change-Id: Ifd2537508ccd9f9331ef94bfdd1ea824f817ca3e
2019-08-01 12:08:42 -07:00
Elliott Hughes
4177df9567 Merge "Reland "Remove product_is_iot.""
am: 80e071d1da

Change-Id: I875289d3b5f88034b4e1256054b41fb9e05dfdd1
2019-08-01 11:59:54 -07:00
Elliott Hughes
80e071d1da Merge "Reland "Remove product_is_iot."" 2019-08-01 18:24:26 +00:00
Jooyung Han
04329f131a Add jsonmodify tool
This tool is used to modify apex_manifest.json when building apex
module.

Here's the usage:

usage: jsonmodify [-h] [-o output] [-v path value] [-s path value]
                     [-r path] [-a path [value ...]]
                     [input]

positional arguments:
  input                 JSON file

optional arguments:
  -h, --help            show this help message and exit
  -o output, --out output
                        write result to a file. If omitted, print to stdout
  -v path value, --value path value
                        set value of the key specified by path. If path
                        doesn't exist, creates new one.
  -s path value, --replace path value
                        replace value of the key specified by path. If path
                        doesn't exist, no op.
  -r path, --remove path
                        remove the key specified by path. If path doesn't
                        exist, no op.
  -a path [value ...], --append_list path [value ...]
                        append values to the list specified by path. If path
                        doesn't exist, creates new list for it.

Bug: 138695532
Test: m jsonmodify
Test: echo {} | jsonmodify -v name hello -a list.nested a b c
{
  "name": "hello",
  "list": {
    "nested": [
      "a",
      "b",
      "c"
    ]
  }
}

Change-Id: I2cd043c614b3ad2306a0c27ccee302633c6d2525
2019-08-02 00:08:05 +09:00
Roland Levillain
7460073e6f Merge "Materialize the copy commands of an APEX rule as a Ninja response file." am: ec5fc70856 am: 1334934d12 am: 8e5f3a978a
am: a078876c72

Change-Id: I06d854072fb77f6ba3a18972dba7c99aab373d68
2019-08-01 07:53:02 -07:00
Jooyung Han
e16330393a Put dependency in apex_manifest.json
To generate ld.config.txt dynamically(b/123722631), each APEX should
provide some dependency information:
a) list of libraries which other APEXes(or system) can use from this apex
b) list of libraries which this apex uses from other APEXes(or system)

This change puts dependency information in apex_manifest.json at
build-time with two additional keys:
a) provideNativeLibs
b) requireNativeLibs

Bug: 138695532
Test: m (runs soong tests)
Test: find $OUT/apex -name apex_manifest.json  -exec cat {} \;
 (shows contents of apex_manifest.json files)

Change-Id: Iaad12c8c35454222ad177ce923cce76ef12a8a5a
2019-08-01 23:45:37 +09:00
Roland Levillain
a078876c72 Merge "Materialize the copy commands of an APEX rule as a Ninja response file." am: ec5fc70856 am: 1334934d12
am: 8e5f3a978a

Change-Id: I65952943683a75a22655b13983ea203670969e29
2019-08-01 07:44:36 -07:00
Elliott Hughes
1f3a239953 Reland "Remove product_is_iot."
This reverts commit 5089c11b1e.

Change-Id: Iaedc22e63560a01ab01859982dc627569a421025
Test: treehugger
2019-08-01 14:42:12 +00:00
Roland Levillain
8e5f3a978a Merge "Materialize the copy commands of an APEX rule as a Ninja response file." am: ec5fc70856
am: 1334934d12

Change-Id: I7cd28d0ea7ba7bf544301126a10ad92004a41f11
2019-08-01 07:34:28 -07:00
Roland Levillain
1334934d12 Merge "Materialize the copy commands of an APEX rule as a Ninja response file."
am: ec5fc70856

Change-Id: I518abfeba6fcd55ba05745304552c7f741e2e632
2019-08-01 07:24:35 -07:00
Roland Levillain
ec5fc70856 Merge "Materialize the copy commands of an APEX rule as a Ninja response file." 2019-08-01 13:51:22 +00:00
Slava Shklyaev
2eb7035930 Merge "Add neuralnetworks to ndkPrebuiltSharedLibs" am: 395ab52ee9 am: a9c30574ce am: fcc877327e
am: 68fcb5bbd4

Change-Id: Iaed7460ab08c471e8d3949ee47a833a4e9d58503
2019-08-01 04:27:41 -07:00
Slava Shklyaev
68fcb5bbd4 Merge "Add neuralnetworks to ndkPrebuiltSharedLibs" am: 395ab52ee9 am: a9c30574ce
am: fcc877327e

Change-Id: Ie07ae76cf40ce7de3b7bc125af49dc282f3fe2de
2019-08-01 04:10:53 -07:00
Nelson Li
bfaf58d647 Merge "Revert "Remove product_is_iot."" am: 604374742d am: 742677d7b6 am: 171f6bfa7b
am: b9d3f26dab

Change-Id: I6e299afb20777a886fbf8d4ae46bea582ac9b933
2019-08-01 04:09:47 -07:00
Slava Shklyaev
fcc877327e Merge "Add neuralnetworks to ndkPrebuiltSharedLibs" am: 395ab52ee9
am: a9c30574ce

Change-Id: I0c80ed8eb2cd5c959688e1a234f903bb7fc9b06b
2019-08-01 03:59:39 -07:00
Nelson Li
b9d3f26dab Merge "Revert "Remove product_is_iot."" am: 604374742d am: 742677d7b6
am: 171f6bfa7b

Change-Id: I13f538214a202721f861b97c6cb5758e4f7dee45
2019-08-01 03:58:44 -07:00