Commit Graph

5435 Commits

Author SHA1 Message Date
Jayant Chowdhary
c86d1850c7 Merge "Copy abidiffs into /abidiffs on abi breakages." am: 3e6584556d
am: eb11ca9596

Change-Id: If63adfeb06b0c60a79ae6ce04d89cac7a6349aff
2017-11-28 22:53:32 +00:00
Jayant Chowdhary
eb11ca9596 Merge "Copy abidiffs into /abidiffs on abi breakages."
am: 3e6584556d

Change-Id: I755837f010548dc8b9dec4350058aac7768a17e4
2017-11-28 22:47:02 +00:00
Jayant Chowdhary
3e6584556d Merge "Copy abidiffs into /abidiffs on abi breakages." 2017-11-28 22:38:32 +00:00
Colin Cross
218a09f607 Merge "Move java test resources in mock filesystem to a different directory" am: 88c24a38e5
am: 292325153d

Change-Id: I8a7b40c8da3f91742c3d63185900ac638b57aaae
2017-11-28 21:36:08 +00:00
Colin Cross
292325153d Merge "Move java test resources in mock filesystem to a different directory"
am: 88c24a38e5

Change-Id: I3ac5d48b76d9714c7fd0c5552595f46775e58188
2017-11-28 21:32:37 +00:00
Colin Cross
49a61e1a1a Merge "Add Jacoco support" am: 8b732c1cd5
am: 1d2845e46f

Change-Id: I286ad51853a501a5792bf2e54e27eaa6bb0f2622
2017-11-28 21:25:27 +00:00
Colin Cross
88c24a38e5 Merge "Move java test resources in mock filesystem to a different directory" 2017-11-28 21:24:52 +00:00
Colin Cross
1d2845e46f Merge "Add Jacoco support"
am: 8b732c1cd5

Change-Id: I02f865600d9aa119a04e04c1a0b67b1d54826d54
2017-11-28 21:18:51 +00:00
Colin Cross
8b732c1cd5 Merge "Add Jacoco support" 2017-11-28 21:10:57 +00:00
Colin Cross
40c7834fb8 Merge changes from topic "pathtools.Match" am: 496d057ef3
am: ff9ff4695f

Change-Id: I44e19ab82c5f38a642ba2893701e83c630ee2fd8
2017-11-28 21:01:12 +00:00
Colin Cross
e7b57e32ea Support exclusions and Blueprint-style ** globs in zip2zip am: f3831d0e08
am: 5579297d88

Change-Id: I25ccff9fd763e246f583ab3eb4353e2d8b771e1d
2017-11-28 21:01:08 +00:00
Colin Cross
ff9ff4695f Merge changes from topic "pathtools.Match"
am: 496d057ef3

Change-Id: I57db377973f14a6c8b206ff4a2ba76c4cde7cf91
2017-11-28 20:55:04 +00:00
Colin Cross
5579297d88 Support exclusions and Blueprint-style ** globs in zip2zip
am: f3831d0e08

Change-Id: I7968a56495aa661437180e43a27ae36029216ce9
2017-11-28 20:54:51 +00:00
Colin Cross
496d057ef3 Merge changes from topic "pathtools.Match"
* changes:
  Add support for --ignore_duplicates to merge_zips
  Support exclusions and Blueprint-style ** globs in zip2zip
2017-11-28 20:45:38 +00:00
Jeff Gaston
d384cc7b9a Merge "Have Soong cc static linker dep order account for shared deps too" am: 5921ab3347
am: f93e082b68

Change-Id: I4c2ba1e16f170bc533919e530209b79ff2a2d5a4
2017-11-28 20:41:04 +00:00
Jeff Gaston
f93e082b68 Merge "Have Soong cc static linker dep order account for shared deps too"
am: 5921ab3347

Change-Id: I0d4169273c124230c0be9ecaacd78cb1d820df27
2017-11-28 20:37:04 +00:00
Jeff Gaston
5921ab3347 Merge "Have Soong cc static linker dep order account for shared deps too" 2017-11-28 20:28:29 +00:00
Colin Cross
b9077753ba Fix passing dex_preopt value to make am: b4972e3d96
am: 15bf63051c

Change-Id: Ied06ec37890f21536f3c9ebe6d7e201b670549e5
2017-11-28 19:55:31 +00:00
Colin Cross
15bf63051c Fix passing dex_preopt value to make
am: b4972e3d96

Change-Id: I84e338b3f4dde5dea81ce4f18da1ed33bc0ffc41
2017-11-28 19:51:59 +00:00
Jayant Chowdhary
219139df8c Copy abidiffs into /abidiffs on abi breakages.
Bug: 64267858

Test: create reference abi dump for libjpeg locally. Change return type
      of libjpeg_std_err and build with :
      BOARD_VNDK_VERSION=current mm -j64 showcommands dist
      Build fails and abidiff report gets copied into out/dist/abidiffs.

Change-Id: I7c8ecfac95361e731009e5913bd3a7bb323a9597
2017-11-27 17:16:29 -08:00
Jeff Gaston
f5b6e8f8c7 Have Soong cc static linker dep order account for shared deps too
Bug: b/69639803
Test: m -j nothing # which runs unit tests
Test: m -j checkbuild
Change-Id: I2eedfe8b88ec5c715ef729bf113d168a2bc3524d
2017-11-27 17:14:06 -08:00
Colin Cross
824bee347d Move java test resources in mock filesystem to a different directory
Move the java test resources from res to java-res to avoid confusion
with Android app resources that are implicitly expected in res.
Also allow tests to provide extra files.

Test: java_test.go
Change-Id: I13349a21da5c6d449cd23947c2628efbed3eb230
2017-11-24 11:22:21 -08:00
Colin Cross
cb9335932f Add Jacoco support
Add support for instrumenting jars with jacoco.  Unlike in Make,
Jacoco in Soong is done entirely using jars.

Instrumentation is enabled by EMMA_INSTRUMENT=true, and affects
all apps.  If EMMA_INSTRUMENT_FRAMEWORK=true then it also affects
any java libraries listed in InstrumentFrameworkModules.

Bug: 69629238
Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true SKIP_BOOT_JARS_CHECK=true WITH_DEXPREOPT=false
Change-Id: If699715b277529cd7322ffca67c23b0746e1cccd
2017-11-22 16:08:53 -08:00
Colin Cross
e909e1e079 Add support for --ignore_duplicates to merge_zips
Add a --ignore_duplicates option to cause merge_zips to
silently take the first entry in the case of duplicate entries
in the zips to be merged.  This will be used for soong Jacoco
support to combine the instrumented jar with the original jar
to pick up any classes that were excluded.

Bug: 69629238
Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true SKIP_BOOT_JARS_CHECK=true WITH_DEXPREOPT=false
Change-Id: I49ede3f07ce0ed7701b4db7058da2e4f11b8043e
2017-11-22 16:08:35 -08:00
Colin Cross
f3831d0e08 Support exclusions and Blueprint-style ** globs in zip2zip
Jacoco support will use zip2zip to create a jar that is a subset
of another jar, and will need exclusion filters and recursive
globs.  Switch zip2zip from filepath.Match to pathtools.Match,
and check each included file against the exclusion list.

Bug: 69629238
Test: zip2zip_test.go
Change-Id: Ibe961b0775987f52f1efa357e1201c3ebb81ca9c
2017-11-22 16:08:34 -08:00
Colin Cross
b4972e3d96 Fix passing dex_preopt value to make
dex_preopt defaults to true, only pass LOCAL_DEX_PREOPT := false
if dex_preopt is explcitly set to false.

Test: m, examine framework.jar
Change-Id: Ica6ce06d14bbc720da9c5b26559b9768a8a7f5a8
2017-11-22 16:08:34 -08:00
Jeff Gaston
14a48ac015 Merge "Autodetect files named Android.bp in tests" am: b06ad36c1f
am: c4d1eb00e8

Change-Id: I6651112d29a0973d117dd1a0b05d6a64fc73acaa
2017-11-22 22:42:44 +00:00
Jeff Gaston
c4d1eb00e8 Merge "Autodetect files named Android.bp in tests"
am: b06ad36c1f

Change-Id: Iadd1cc36adc31bdd548709e7729385ac7eca2750
2017-11-22 22:38:13 +00:00
Jeff Gaston
b06ad36c1f Merge "Autodetect files named Android.bp in tests" 2017-11-22 22:30:13 +00:00
Vishwath Mohan
bf7dbc748a Merge "Reduce how often both mutated variants are needed." am: 5c986c3dc3
am: 24725d967b

Change-Id: I3742861c239eceb9e55bb773a957c6d861a49192
2017-11-22 00:16:07 +00:00
Vishwath Mohan
24725d967b Merge "Reduce how often both mutated variants are needed."
am: 5c986c3dc3

Change-Id: I67f8adb96105b993b91a5d2b731a7577b9f9e0b1
2017-11-22 00:12:20 +00:00
Treehugger Robot
5c986c3dc3 Merge "Reduce how often both mutated variants are needed." 2017-11-22 00:05:30 +00:00
Pirama Arumuga Nainar
9a1483bfe6 Merge "Use -mcpu=cortex-a53 for devices with Kryo" am: 49b14daf03
am: 34fcefe690

Change-Id: I07d637fd6fd636e596f22e810ecdc88b72d60f5f
2017-11-21 22:15:36 +00:00
Pirama Arumuga Nainar
34fcefe690 Merge "Use -mcpu=cortex-a53 for devices with Kryo"
am: 49b14daf03

Change-Id: I5bc1b39524521fe97ed2b97ef3e485ecbab02b60
2017-11-21 22:13:36 +00:00
Vishwath Mohan
e712879d5d Reduce how often both mutated variants are needed.
This CL rolls back how often we bubble up both sanitized and
un-sanitized variants of a component. With this change only
CFI-enabled target static libraries will do this, all other cases
suppress one of the two variants (both from being installed and from
being exposed to Make for make-embedded builds).

This means we shouldn't need a separate sanitizer suffix for ASAN at
all (.asan), and similarly for non static-lib CFI components (.cfi),
so this CL changes that as well.

Lastly, because the version of ar meant for the host is not built
with plugin support (which CFI requires), this CL disables CFI for
host targets.

This CL should fix the following 2 issues:
(1) Removing warnings about multiple rules existing for the same
installable target.

(2) Fixing VTS packaging, which had been broken by the generation of
the .asan suffix.

Bug: 69172424, 69059192, 67507323
Test: m -j40 # Soong generated .mk file does not have duplicate rules.
Test: SANITIZE_TARGET="address" m -j40 libstagefright # installed
correctly.

Change-Id: Ib90fdbc8a6ad3924fc2a691b7277a8a1bc67cda8
2017-11-21 14:09:09 -08:00
Treehugger Robot
49b14daf03 Merge "Use -mcpu=cortex-a53 for devices with Kryo" 2017-11-21 22:05:44 +00:00
Chih-hung Hsieh
fc49581152 Merge "Add default -Wall -Werror or -Wall." am: 488131912f
am: 20cfee85b4

Change-Id: Icdc38ca531da813f26e28988749855e1d92397ce
2017-11-21 21:28:24 +00:00
Chih-hung Hsieh
20cfee85b4 Merge "Add default -Wall -Werror or -Wall."
am: 488131912f

Change-Id: I172cc302d35fbd966dbe27bcb1a6e442f6c0486b
2017-11-21 21:24:15 +00:00
Chih-hung Hsieh
488131912f Merge "Add default -Wall -Werror or -Wall." 2017-11-21 21:19:01 +00:00
Jeff Gaston
2be207ae4c Merge "Prohibit accidental renames of product config json fields" am: e261615792
am: 1855861067

Change-Id: Ib090d6fba5f0b41dbd680dd4f374575674befeda
2017-11-21 20:28:58 +00:00
Jeff Gaston
1855861067 Merge "Prohibit accidental renames of product config json fields"
am: e261615792

Change-Id: Ib18850cfb81f7d3f5f69305f236e3d6c3972372f
2017-11-21 20:26:28 +00:00
Jeff Gaston
e261615792 Merge "Prohibit accidental renames of product config json fields" 2017-11-21 20:20:42 +00:00
Pirama Arumuga Nainar
c17b275ed3 Use -mcpu=cortex-a53 for devices with Kryo
Bug: http://b/69481735

While Clang supports -mcpu=kryo, the GNU assembler doesn't.  Use
Cortex-a53 instead, which is close to Kryo.  The current alternative of
using Krait causes problems when also using armv8, which is not
available in Krait.

Test: Build marlin with internal CL 3248394 cherry-picked.
Change-Id: I571739e6ab4f1b37fafb304ecad2865c9394e04f
2017-11-21 09:35:42 -08:00
Colin Cross
5b68beb4a3 Make AndroidRuleFunc callback take a Config am: cf31fcfc71
am: 1c2a091d8f

Change-Id: I62b245a37924d20f2280029b60d2ed0c5f3964ac
2017-11-21 04:47:03 +00:00
Colin Cross
1c2a091d8f Make AndroidRuleFunc callback take a Config
am: cf31fcfc71

Change-Id: Ia982afcebaaa0efac1b42fbc002ccdca5419fa7b
2017-11-21 04:44:30 +00:00
Chih-Hung Hsieh
64a38dcb18 Add default -Wall -Werror or -Wall.
* When -Wno-error and -Werror are not used:
  add -Wall to the front of cflags
  if the project is in the WarningAllowedProjects,
  otherwise add -Wall -Werror.
* Add -Wall -Werror to ndk_library build targets.
* Collect names of modules with -Wno-error or without -Werror,
  and pass them to makefile variables:
      SOONG_MODULES_USING_WNO_ERROR
      SOONG_MODULES_ADDED_WERROR
      SOONG_MODULES_ADDED_WALL
* Generate ANDROID_WARNING_ALLOWED_PROJECTS for old makefiles.

Bug: 66996870
Test: normal build
Change-Id: I31385e12b80ca946c7395a5a184ef259b029aac6
2017-11-20 18:28:26 -08:00
Jeff Gaston
f5f6e49478 Prohibit accidental renames of product config json fields
Can be caused by `json:"omitempty"` instead of `json:",omitempty"`

Bug: 69076024
Test: m -j # which runs unit tests
Change-Id: I92e3193d00a740c72d36a56748e0b0a8ad1d772e
2017-11-20 16:28:53 -08:00
Colin Cross
cf31fcfc71 Make AndroidRuleFunc callback take a Config
Convert the interface{} to android.Config before calling
the callback.

Test: m checkbuild
Change-Id: Iab1173d3c0bbeff662afcbc1d6ce7c982b6b7720
2017-11-20 12:23:00 -08:00
Tobias Thierer
0ea5223d55 Merge "kotlinc: Always pass -jvm-target 1.8" am: 6693613f11
am: 90b3c9f593

Change-Id: Idfd11e5d11de4f5baaf4ab80b54a217a936f0796
2017-11-20 13:19:57 +00:00
Tobias Thierer
90b3c9f593 Merge "kotlinc: Always pass -jvm-target 1.8"
am: 6693613f11

Change-Id: Id7e6ec4d5a1c90eb74e2bd83dd4f1294ab2aef91
2017-11-20 13:17:28 +00:00