Commit graph

11886 commits

Author SHA1 Message Date
Tao Bao
3dec68ea3f Merge "Makefile: Add the missing dependency on FUTILITY."
am: 4e429cccd6

Change-Id: I4e26b51ae65f1d13bf4d8e959422876c0956c568
2017-02-23 18:52:41 +00:00
Tao Bao
4e429cccd6 Merge "Makefile: Add the missing dependency on FUTILITY." 2017-02-23 18:47:13 +00:00
Colin Cross
4a4325d313 Merge "Pass min sdk version to dx and desugar"
am: bbad7c3e1f

Change-Id: I5bfc25abcca9a3cfcb22ed0c5bf39e626fe64ec4
2017-02-23 18:20:23 +00:00
Colin Cross
bbad7c3e1f Merge "Pass min sdk version to dx and desugar" 2017-02-23 18:18:38 +00:00
Colin Cross
119e97b375 Remove cpusets and schedboost product variables
They are no longer needed, remove them.

Bug: 35129304
Bug: 35128496
Test: builds
Change-Id: Ic0bb04f80d78a1aef2adfeb2af816eecabdbc4ba
2017-02-23 09:47:36 -08:00
Tao Bao
4b577413ff Makefile: Add the missing dependency on FUTILITY.
Bug: 35467608
Test: lunch aosp_dragon-userdebug; m dist
Change-Id: If3824ac22926f3c3cc09d5b82cb0f6da4132f937
2017-02-22 22:54:49 -08:00
Colin Cross
c432176a09 Merge "Don't duplicate default platform libraries into proguard flags"
am: f7b6bf8cb1

Change-Id: Ie0320268dcd5c751570fe333f0e32cfdd7c81524
2017-02-23 02:15:18 +00:00
Colin Cross
f7b6bf8cb1 Merge "Don't duplicate default platform libraries into proguard flags" 2017-02-23 02:12:27 +00:00
Colin Cross
5118a25bd9 Don't duplicate default platform libraries into proguard flags
Test: builds
Change-Id: Ib972d954972614f3e6ce522c58fce06beeda3cea
2017-02-22 14:37:03 -08:00
Simran Basi
0d0f7e1c7b Merge "Add device-tests and general-tests make targets."
am: c436f9eeec

Change-Id: Ic238377df600af06397d31bd4f5661e9a7e5316e
2017-02-22 19:46:18 +00:00
Treehugger Robot
c436f9eeec Merge "Add device-tests and general-tests make targets." 2017-02-22 19:35:47 +00:00
Dan Willemsen
33631b3580 Add progress indicator to Android.mk includes
Test: m -j
Change-Id: I1e6fd020a06b49c243be14953d9f417e64ac7b8b
2017-02-22 11:20:51 -08:00
Colin Cross
536ef4e35a Pass min sdk version to dx and desugar
Test: make checkbuild
Change-Id: Idde9712508571ea623126c7d25d2fa67eccf4833
2017-02-22 11:10:37 -08:00
Paul Duffin
3e93d553ec Merge "Filter JUnit and android.test classes from applications using proguard"
am: 38a231d6c3

Change-Id: I42f53657f38aaead6bfde4015992991dbb058575
2017-02-22 12:20:54 +00:00
Paul Duffin
38a231d6c3 Merge "Filter JUnit and android.test classes from applications using proguard" 2017-02-22 12:15:27 +00:00
Colin Cross
f78a2f821c Merge "Use ifndef or ifeq () instead of ifeq """
am: 1948f64dd5

Change-Id: I0a582b85ae540f9b164c93cf5363049258983a64
2017-02-22 04:30:00 +00:00
Colin Cross
63fe36abbe Use ifndef or ifeq () instead of ifeq ""
ifeq with quotes is technically correct make syntax, but rarely used.
Replace it with the simpler ifndef when comparing against empty, or
with parenthesis for consistency.

Test: builds
Change-Id: Idcbe0586c4626c67d560694596b0bd9f5f93484a
2017-02-21 17:29:10 -08:00
Simran Basi
9c295b4415 Add device-tests and general-tests make targets.
Adds the device-tests and general-tests makefiles and
added include lines to main.mk so that individual test
modules can be built properly.

These targets do not build any special tradefed wrapper
that normal *TS's usually employ. They are not necessary
here.

Bug: 35350788
Test: Updated several CTS test modules to belong to these
      suites instead and ran:
      `rm -rf out; make clean; make device-tests general-tests -j`
      then verified the output.

Change-Id: I40e3958375f7b39cb56508f2812ce9760d403f6f
2017-02-21 17:04:47 -08:00
Dan Willemsen
283ed982cd Merge "Stop double-printing config"
am: a7d4e0cd73

Change-Id: Icefca1547a8361d3678b8be7d30776325de47b73
2017-02-22 00:58:46 +00:00
Dan Willemsen
0d25529b4c Stop double-printing config
Don't print the config in Kati when we've already printed it in soong_ui
or the make wrapper.

Test: m -j
Test: USE_SOONG_UI=true m -j
Change-Id: Ic6dce0ab29d584d85c6642c597f6e9dcd6ba9dca
2017-02-21 15:12:15 -08:00
Paul Duffin
f22aca1e47 Filter JUnit and android.test classes from applications using proguard
The new javac/desugar/proguard/dx based toolchain can fail if
there are duplicate classes in the -injars and -libraryjars
passed to proguard. That causes problems for b/30188076 which
is attempting to remove various junit and android.test classes
from the API because it requires the changes to add those
classes statically to applications are submitted simultaneously
with the change to remove the classes from the API which is not
feasible.

This change simply causes Proguard to ignore the classes from
the application JAR so it will always use them from the library.
That allows the changes to be done separately and only requires
that this change is reverted simultaneously with the change to
update the API.

Bug: 30188076
Test: make checkbuild and make -j ANDROID_FORCE_JACK_ENABLED=disabled checkbuild
Change-Id: I6ed6c45a159d6261d90245551aa2913cc82d2e8b
2017-02-21 13:11:13 +00:00
Paul Duffin
4e5d1b0624 Merge "2nd attempt to remove legacy-test from TARGET_DEFAULT_JAVA_LIBRARIES"
am: 6cf9da761a

Change-Id: Ie5425a088e63d2b13c1b4e92da2243176ce9706b
2017-02-20 11:58:37 +00:00
Paul Duffin
6cf9da761a Merge "2nd attempt to remove legacy-test from TARGET_DEFAULT_JAVA_LIBRARIES" 2017-02-20 11:51:01 +00:00
Colin Cross
58ffd38f97 Merge "Revert "Revert "Add soong_javac_filter to all javac commands"""
am: 29f3642dd1

Change-Id: I1e39a9155fecc6cb0a1031d2b04299fdfdf1442b
2017-02-20 07:01:22 +00:00
Colin Cross
440079b84b Revert "Revert "Add soong_javac_filter to all javac commands""
This reverts commit 52d2253ff9.

Test: pipe the grok build output through soong_javac_filter
Change-Id: I449a61ed2c95b3e1afd51a31a11baab15d97e2f2
2017-02-19 19:56:51 -08:00
Colin Cross
2f23c5caf7 Merge "Disable building coverage with javac"
am: 271b1f6521

Change-Id: Ie65e362bd9736623dec3041891f060cf56b98895
2017-02-19 06:28:53 +00:00
Treehugger Robot
271b1f6521 Merge "Disable building coverage with javac" 2017-02-19 06:22:26 +00:00
Colin Cross
25a79dacd9 Disable building coverage with javac
Emma is unable to process framework.jar, and making framework
classes.jar depend on the emma output causes builds to fail when
emma is enabled.  Make classes.jar depend on the jarjar output
instead, bypassing emma for now.

Test: m -j EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true check-public-api
Change-Id: I861282292816e29ca27b67a3eef978d951c1a4dc
2017-02-17 23:47:26 -08:00
Colin Cross
9003bc7d4b Merge "Build all the way to classes.dex for checkbuild"
am: 41c7d8423b

Change-Id: I11b0cea9ccd40b29e6dc1338a0d29194df1d2579
2017-02-18 01:38:21 +00:00
Treehugger Robot
41c7d8423b Merge "Build all the way to classes.dex for checkbuild" 2017-02-18 01:35:40 +00:00
Colin Cross
e4381dcac2 Merge "Add a desugar step between javac and proguard"
am: 9e92c2fd18

Change-Id: I1bcbc1a9d98cad43b5f67f54b8e09de8bf8eb67b
2017-02-18 01:13:19 +00:00
Colin Cross
9e92c2fd18 Merge "Add a desugar step between javac and proguard" 2017-02-18 01:10:08 +00:00
Tao Bao
6498b2efbf Merge "Build FUTILITY tool from futility-host."
am: c53607d9cc

Change-Id: Ieabf4a622916a7ed18b0adac4f5091dcea96d659
2017-02-18 01:09:48 +00:00
Tao Bao
c53607d9cc Merge "Build FUTILITY tool from futility-host." 2017-02-18 01:04:31 +00:00
Dan Willemsen
e4a0dd15cc Merge "Remove unused zipalign macros"
am: 56183c2ee2

Change-Id: I7c743f2b694652af35f74b0e61c3dfe290812b18
2017-02-18 00:18:45 +00:00
Treehugger Robot
56183c2ee2 Merge "Remove unused zipalign macros" 2017-02-18 00:12:42 +00:00
Dan Willemsen
ea2687fab6 Merge "Add Header Library support to Make"
am: 4f794fdd50

Change-Id: I44b0f0fe5c0f4d65bf205165e4ec05403f738066
2017-02-17 23:55:16 +00:00
Dan Willemsen
4f794fdd50 Merge "Add Header Library support to Make" 2017-02-17 23:50:41 +00:00
Colin Cross
e1159f5b39 Build all the way to classes.dex for checkbuild
Test: m -j checkbuild
Change-Id: Ie1b7be01c9bbcf1a32399f19d050a93410bdb42b
2017-02-17 15:03:07 -08:00
Colin Cross
eac5ce4e97 Add a desugar step between javac and proguard
This enables support for lambdas by passing class files through the
desugar tool.

Test: m -j checkbuild tests cts
Change-Id: I14ec152355243fd67fe2f107ccbe67a1b4e7e262
2017-02-17 15:03:06 -08:00
Colin Cross
cb78c50239 Merge "Revert "Add soong_javac_filter to all javac commands""
am: 6dd4debe74

Change-Id: I31aedc360439bd26f205d6db1502297d7ca5b63a
2017-02-17 23:00:09 +00:00
Colin Cross
6dd4debe74 Merge "Revert "Add soong_javac_filter to all javac commands"" 2017-02-17 22:54:06 +00:00
Colin Cross
52d2253ff9 Revert "Add soong_javac_filter to all javac commands"
This reverts commit a341bf0f86.

Breaks grok builds that replace javac with another tool:
reading standard input: bufio.Scanner: token too long

Change-Id: I825587c465b05c1fbddb7794dc1c84f5f2c883d1
2017-02-17 22:53:42 +00:00
Colin Cross
8283b186be Merge changes I7e8fcd2e,Ie12d743c
am: 547f7393d7

Change-Id: Id9cd5b894a599ca660363234863fdfc6602575d2
2017-02-17 22:34:39 +00:00
Colin Cross
547f7393d7 Merge changes I7e8fcd2e,Ie12d743c
* changes:
  Add soong_javac_filter to all javac commands
  Re-enable dx support
2017-02-17 22:19:08 +00:00
Tao Bao
e98fb7a8d3 Build FUTILITY tool from futility-host.
Also pack the tool, vboot_signer.sh script and the test keys into
otatools.zip. This allows signing ryu target without a source repo.

Bug: 35467608
Test: m otatools-package and check the newly included files.
Test: Use otatools.zip to sign a ryu target.
Change-Id: I70f7b359f21a579463d5c7251daac81a97e338cc
2017-02-17 14:16:46 -08:00
Dan Willemsen
85acdfac58 Remove unused zipalign macros
Test: codesearch
Test: build-marlin.ninja is identical before/after (in internal master)
Change-Id: I1c5c39cabcc166b8e8608ace3290b7027d258624
2017-02-17 10:44:30 -08:00
Colin Cross
653470d457 Merge "Set IS_AT_LEAST_* variables based on TARGET_PLATFORM_VERSION" am: 738d2de20b am: 4cfa9fcd48
am: 5122f6fd67

Change-Id: I7e13cea1775538c07e952c5770002777eca010bf
2017-02-17 03:50:39 +00:00
Colin Cross
5122f6fd67 Merge "Set IS_AT_LEAST_* variables based on TARGET_PLATFORM_VERSION" am: 738d2de20b
am: 4cfa9fcd48

Change-Id: I9fc141840a2b186b252bd2764344a9e791690ef6
2017-02-17 03:46:08 +00:00
Colin Cross
d3183bdf40 Set IS_AT_LEAST_* variables based on TARGET_PLATFORM_VERSION
Create a default list of minor versions (v, vDR1, vDR2, vMR1, vMR2)
for O and P, and propagate TARGET_PLATFORM_VERSION to IS_AT_LEAST_*
variables.

Test: manual
Bug: 34610721
Change-Id: I575caa099d85ee6fbc79538e67dc8d621e81790f
2017-02-16 17:08:03 -08:00
Colin Cross
a341bf0f86 Add soong_javac_filter to all javac commands
soong_javac_filter colorizes javac output, and hides noisy messages.

Test: builds
Change-Id: I7e8fcd2e4e1ed3ff530a8ccfe931ceb7e411e0ad
2017-02-16 14:08:45 -08:00
Colin Cross
79e2f73b6c Re-enable dx support
This is a partial revert of commits:
858657366f Remove support of disabling Jack.
3ae7861252 Remove javac support in host dex rules.
22313f2b2a Remove rules for building dex with dx

Test: builds
Change-Id: Ie12d743cbe978bdeb030910848b67f5945a4fec8
2017-02-16 14:08:45 -08:00
Dan Willemsen
8dae49c5e1 Add Header Library support to Make
We currently use static libraries without any source files to represent
header libraries, but Soong actually has cc_library_headers. So to
export those in a separate namespace from static libraries, implement
them in Make as well.

This also adds a nice pretty-warning / pretty-error macro that can be
used to print out standard warning messages pointing to the real source
file having the problem.

Test: Use a header library exported by Soong in a Make module
Change-Id: I3486539e247524cb82a20620745fc7be03014e14
2017-02-15 16:04:49 -08:00
Vishwath Mohan
7832d8737d Merge "Blacklist code for CFI." am: 5f50896a7f am: f1e39159c8
am: cdf79d7298

Change-Id: I5ada41559bca3b98a48e6fb29c535e445f7ef7fb
2017-02-15 23:41:21 +00:00
Vishwath Mohan
cdf79d7298 Merge "Blacklist code for CFI." am: 5f50896a7f
am: f1e39159c8

Change-Id: I54c3d78d16069abce64f007942fda7e28f703303
2017-02-15 23:37:48 +00:00
Treehugger Robot
5f50896a7f Merge "Blacklist code for CFI." 2017-02-15 22:52:46 +00:00
Vishwath Mohan
5b69c06f1f Blacklist code for CFI.
Adds the -fsanitize-blacklist option for CFI, using the built in
blacklist at external/compiler-rt/lib/cfi/cfi_blacklist.txt.

Also refactors the CFI cflags and ldflags into ../soong/cc/makevars.go
to ensure they're consistent across Soong and make projects.

Bug: 30227045
Test: ENABLE_CFI=true m -j40 builds and boots.
Test: The blacklist prevents runtime errors that otherwise occur.
Change-Id: I0c2801ed459a3b9adeb37daff3ca212564801259
2017-02-15 12:48:05 -08:00
Dan Willemsen
72cdc68467 Merge "Fix init rc installation in vendor when LOCAL_MODULE_PATH is set" am: 74dcb9feb3 am: 8d0fda5f9e
am: 5721a9140c

Change-Id: Iae0fde3dfefcac41e482ec880bf9296a48f26174
2017-02-15 00:59:15 +00:00
Dan Willemsen
5721a9140c Merge "Fix init rc installation in vendor when LOCAL_MODULE_PATH is set" am: 74dcb9feb3
am: 8d0fda5f9e

Change-Id: Idc39d13b21c677258d24f1e93474f65438a4532a
2017-02-15 00:56:43 +00:00
Treehugger Robot
74dcb9feb3 Merge "Fix init rc installation in vendor when LOCAL_MODULE_PATH is set" 2017-02-15 00:45:19 +00:00
Dan Willemsen
ce18a0d8f4 Merge "Support Soong native coverage" am: c9fa07c958 am: 0c2bd30961
am: c9f5ca3969

Change-Id: Iada65b8bfb9ca28bada7fb4566f8a09a06a99fb8
2017-02-15 00:41:45 +00:00
Dan Willemsen
c9f5ca3969 Merge "Support Soong native coverage" am: c9fa07c958
am: 0c2bd30961

Change-Id: I68a695f1524331d6516ce16cad8ade3162072336
2017-02-15 00:39:13 +00:00
Dan Willemsen
c9fa07c958 Merge "Support Soong native coverage" 2017-02-15 00:32:16 +00:00
Paul Duffin
de88056b17 2nd attempt to remove legacy-test from TARGET_DEFAULT_JAVA_LIBRARIES
Bug: 30188076
Test: make checkbuild

(cherry picked from commit 01fc887a07)

Change-Id: I114948232fd63eaf57a777d37623e4c931bdd0ff
2017-02-14 10:21:44 +00:00
Dan Willemsen
054ac67c5b Merge "Improve installclean to catch more installed files" am: 22b55e1c54 am: af402e14b8
am: 81d2e3ce1f

Change-Id: Ic6d394829fe3ae6e23d759c52e748ffc9f127099
2017-02-14 02:16:44 +00:00
Dan Willemsen
81d2e3ce1f Merge "Improve installclean to catch more installed files" am: 22b55e1c54
am: af402e14b8

Change-Id: I03e4fe40525e320fad7b1e0da08b1351e85f4dd2
2017-02-14 02:14:15 +00:00
Treehugger Robot
22b55e1c54 Merge "Improve installclean to catch more installed files" 2017-02-14 02:06:02 +00:00
Adam Seaton
c54e7f5658 Update Security String to 2017-04-05 on nyc-dev am: 8ee3a4cef1 am: e69e40cc34 am: 9cff197d92 am: af59a1c806
am: 61a00ef2ba

Change-Id: If80382b4934a1828fa4738a21a006012cfa3d7bf
2017-02-13 23:26:43 +00:00
Adam Seaton
8ddb562911 Update Security String to 2017-04-01 on nyc-dev am: 93c1a722c2 am: b1865c4cac am: 4526457528 am: 03dc9a951a
am: 570e257352

Change-Id: I443c49a8d536c5bfa21f53cabb7687adc2778ef6
2017-02-13 23:26:37 +00:00
Adam Seaton
61a00ef2ba Update Security String to 2017-04-05 on nyc-dev am: 8ee3a4cef1 am: e69e40cc34 am: 9cff197d92
am: af59a1c806

Change-Id: Ibae45eca09589a4048389541c121c827b9292cd9
2017-02-13 23:24:44 +00:00
Adam Seaton
570e257352 Update Security String to 2017-04-01 on nyc-dev am: 93c1a722c2 am: b1865c4cac am: 4526457528
am: 03dc9a951a

Change-Id: Ic810aa498e9ebf8cf8224c9abfbbc8e11de863a5
2017-02-13 23:24:37 +00:00
Adam Seaton
af59a1c806 Update Security String to 2017-04-05 on nyc-dev am: 8ee3a4cef1 am: e69e40cc34
am: 9cff197d92

Change-Id: I3d8e3b153f3a693da496429fad538a1fda870f35
2017-02-13 23:21:42 +00:00
Adam Seaton
03dc9a951a Update Security String to 2017-04-01 on nyc-dev am: 93c1a722c2 am: b1865c4cac
am: 4526457528

Change-Id: I1ca1d7d860ae1a360cb04074c973931f1290dc9f
2017-02-13 23:21:36 +00:00
Adam Seaton
9cff197d92 Update Security String to 2017-04-05 on nyc-dev am: 8ee3a4cef1
am: e69e40cc34

Change-Id: I7a30fc2fe048aa1e6da8c7ea808961b5437e713d
2017-02-13 23:18:42 +00:00
Adam Seaton
4526457528 Update Security String to 2017-04-01 on nyc-dev am: 93c1a722c2
am: b1865c4cac

Change-Id: I20cd2ed43edee894f4e1e183628392b54c2c9478
2017-02-13 23:18:36 +00:00
Adam Seaton
e69e40cc34 Update Security String to 2017-04-05 on nyc-dev
am: 8ee3a4cef1

Change-Id: I4f7853e8ce785d41b5f2cd4e67458707e100f056
2017-02-13 23:16:13 +00:00
Adam Seaton
b1865c4cac Update Security String to 2017-04-01 on nyc-dev
am: 93c1a722c2

Change-Id: I76d811946e6f9c7bee897a8bd4e8c49e465dd0c1
2017-02-13 23:16:07 +00:00
Colin Cross
762c8f0ba3 Merge "Don't build tests in normal builds" am: 4bf332a56b am: d364511ce7
am: 3ad23fd09e

Change-Id: I31a0077f6972a0b29638fe0c3ba5c0afddcaee75
2017-02-13 22:48:35 +00:00
Colin Cross
3ad23fd09e Merge "Don't build tests in normal builds" am: 4bf332a56b
am: d364511ce7

Change-Id: I2c14f111bcd2a1425c8bdb92e974e2c4af0ea12c
2017-02-13 22:46:05 +00:00
Colin Cross
4bf332a56b Merge "Don't build tests in normal builds" 2017-02-13 22:38:28 +00:00
Dan Willemsen
b2a5c7b369 Fix init rc installation in vendor when LOCAL_MODULE_PATH is set
The init.rc path selection uses the same partition_tag detection to
select an installation partition. So make sure that we always set
partition_tag even if we've been given an explicit module path.

Bug: 35314904
Test: set proprietary: true to Soong module with an init rc, verify
      that was the only change to build-aosp_arm64.ninja
Change-Id: Ic6ffd7a5177959db96a34a24896b242ee5b09e41
2017-02-13 14:19:47 -08:00
Dan Willemsen
f61e80b739 Improve installclean to catch more installed files
Remove more installation directories. This gets called in between each
incremental build on our build servers.

Bug: 35267243
Test: (m -j; m -j installclean; m -j) ensure no large recompiles
Change-Id: Ied6bea5cad05c1f5e98b1bd1a30fb28ff09df23b
2017-02-13 13:05:02 -08:00
Vishwath Mohan
31e5fbc14b Merge "Disble CFI for ARM32 processes." am: aaf4923734 am: af37b7ffb6
am: 8c6400a271

Change-Id: Iad9668918c329d61111f774e2a7033242aba4ab6
2017-02-13 20:59:59 +00:00
Vishwath Mohan
8c6400a271 Merge "Disble CFI for ARM32 processes." am: aaf4923734
am: af37b7ffb6

Change-Id: Icd921b766b202dd6ab3614051362dfd9ef350afb
2017-02-13 20:57:57 +00:00
Vishwath Mohan
aaf4923734 Merge "Disble CFI for ARM32 processes." 2017-02-13 20:49:20 +00:00
Adam Seaton
8ee3a4cef1 Update Security String to 2017-04-05 on nyc-dev
Bug:35314737
2017-02-13 11:49:59 -08:00
Adam Seaton
93c1a722c2 Update Security String to 2017-04-01 on nyc-dev
Bug:35314737
2017-02-13 11:48:25 -08:00
Alex Deymo
0f9093a31c Merge "Include the LOCAL_REQUIRED_MODULES when packaging." am: 06f3258694 am: 2ee71f6946
am: af5554c699

Change-Id: I8c473313feec8501a0653b924912d5da2229170a
2017-02-13 16:12:10 +00:00
Alex Deymo
af5554c699 Merge "Include the LOCAL_REQUIRED_MODULES when packaging." am: 06f3258694
am: 2ee71f6946

Change-Id: I2efd0f0c7c11f31b5d8e5a83125fb4b0c2a86c76
2017-02-13 16:09:38 +00:00
Alex Deymo
06f3258694 Merge "Include the LOCAL_REQUIRED_MODULES when packaging." 2017-02-13 16:01:35 +00:00
Mathieu Chartier
73ecdaca9b Merge "Add support for preopted app images" am: 8d0b35cf85 am: ce08de32d3
am: 04c3d78e83

Change-Id: If9a728bca120a28c6ea4e1e7410b375fb381098f
2017-02-11 00:12:15 +00:00
Mathieu Chartier
04c3d78e83 Merge "Add support for preopted app images" am: 8d0b35cf85
am: ce08de32d3

Change-Id: I0b8b60dbc921a3ac168fc03afb9647cfd4a6e73a
2017-02-11 00:09:44 +00:00
Mathieu Chartier
8d0b35cf85 Merge "Add support for preopted app images" 2017-02-11 00:05:03 +00:00
Mathieu Chartier
192b91c97f Add support for preopted app images
Enable iff WITH_DEXPREOPT_APP_IMAGE is true.

Test: Clean + build with the flag on and off. Tested Sailfish
booting.

Bug: 34927277

(cherry picked from commit e8ab2a71d7)

Change-Id: I63f98a85c69d99746b11bb6e85c23cf5e48910cf
2017-02-10 13:39:08 -08:00
Simran Basi
52224ac185 Merge "Output *TS testcases to their own subdir in the common testcase folders." am: 4d49966ce3 am: ddb4256322
am: e50b42a578

Change-Id: Ia5201a9b334f3c85e383a230574defb2a6364a17
2017-02-10 21:33:39 +00:00
Simran Basi
e50b42a578 Merge "Output *TS testcases to their own subdir in the common testcase folders." am: 4d49966ce3
am: ddb4256322

Change-Id: Ia7ecb8e951b34def2fa567568145ae56309fbab9
2017-02-10 21:26:39 +00:00
Treehugger Robot
4d49966ce3 Merge "Output *TS testcases to their own subdir in the common testcase folders." 2017-02-10 21:11:59 +00:00
Dan Willemsen
0f90908026 Support Soong native coverage
Soong (or any other prebuilt) can provide a .gcnodir file using
LOCAL_PREBUILT_COVERAGE_ARCHIVE. Just like today, if one isn't provided
for static libraries, an empty one will be created for Make modules to
use.

Also fixes a problem I noticed including whole static libs having
coverage into static libs. It was trying to write to /WHOLE since
PRIVATE_INTERMEDIATES_DIR was not set.

Bug: 32749731
Test: See build/soong change for soong-side tests
Test: Enabled coverage of a soong static lib, then include it in a make
static lib with LOCAL_WHOLE_STATIC_LIBRARIES and ensure that the any
shared libraries using the make static lib get the embedded coverage
information.
Change-Id: I32762f099c9757074fec922ee4822f819c9ceaf5
2017-02-10 09:27:35 -08:00
Jack He
564f05b469 Merge "Remove mk file parser variables that are no longer required by system/bt" am: af055f207a am: 3e387c210d
am: 35130f2346

Change-Id: I4d91f322d079d163be7526607c8234a120bcce85
2017-02-10 01:07:19 +00:00
Jack He
35130f2346 Merge "Remove mk file parser variables that are no longer required by system/bt" am: af055f207a
am: 3e387c210d

Change-Id: Idef71b74b4067a83afc55894f453c433a1f3e289
2017-02-10 01:01:49 +00:00
Treehugger Robot
af055f207a Merge "Remove mk file parser variables that are no longer required by system/bt" 2017-02-10 00:53:25 +00:00
Dan Willemsen
b6deae08fe Merge "Sort clear_vars.mk again" am: 05106468f8 am: 03b7efd871
am: dc59849984

Change-Id: I4124d5676a29298cc4a9202dfbe5821b60786208
2017-02-10 00:23:22 +00:00
Dan Willemsen
dc59849984 Merge "Sort clear_vars.mk again" am: 05106468f8
am: 03b7efd871

Change-Id: I211ea6e5e596f752a62fbf47994fbcaaca01cd4d
2017-02-10 00:21:21 +00:00
Dan Willemsen
88ac806adf Sort clear_vars.mk again
Test: none
Change-Id: Id776e81977695c4b488f44b155f2c098d5f8b61a
2017-02-09 14:28:22 -08:00
Jack He
fae1cd13f0 Remove mk file parser variables that are no longer required by system/bt
* Removed BLUETOOTH_HCI_USE_MCT
* Removed BOARD_BLUETOOTH_BDROID_HCILP_INCLUDED

Bug: 35203653, 34951912
Test: Code compilation, no user visible effects
Change-Id: Ic575d3a0fac541da3e70543d0f144ea4792bc058
2017-02-09 14:28:00 -08:00
Dan Willemsen
05b6cf7516 Merge "Fix "Nothing to be done" messages when launching soong_ui" am: 576c76160b am: b7075868bd
am: 990bcc985a

Change-Id: Ic181243ba4647136f64712162b5568b123fa23ef
2017-02-09 05:50:52 +00:00
Dan Willemsen
990bcc985a Merge "Fix "Nothing to be done" messages when launching soong_ui" am: 576c76160b
am: b7075868bd

Change-Id: I0e01c87c3a29ee78ecbf44394dbfc5fccd5de4c9
2017-02-09 05:49:52 +00:00
Dan Willemsen
c5bb5a8238 Fix "Nothing to be done" messages when launching soong_ui
When specifying multiple arguments to make, we were getting messages
about nothing to be done:

m -j USE_SOONG_UI=true checkbuild tests cts blueprint_tools
...
make: Nothing to be done for `tests'.
make: Nothing to be done for `cts'.
make: Nothing to be done for `blueprint_tools'.

Test: m -j USE_SOONG_UI=true blueprint_tools libc adb
Change-Id: Id448bf0e09736fcd92ba058aec7ce556f6f778a3
2017-02-08 19:50:16 -08:00
Vishwath Mohan
a2046062fb Disble CFI for ARM32 processes.
This CL disables CFI for 32-bit ARM processes, which is broken due to
a compiler error in the most recent version of clang.

Bug: 35157333
Test: ENABLE_CFI=true m -j40 does not enable CFI for 32-bit processes
Change-Id: I6a6e1d14c8365da1056b4cbccad11ef2f15c70b2
2017-02-08 19:38:20 -08:00
Simran Basi
3fb354cca0 Output *TS testcases to their own subdir in the common testcase folders.
Instead of dumping all *TS testcases into the common testcase
directory directly, place them all in their own subdirectory.

Bug: 35153177
Test: `make cts -j` and checked the contents of both:
out/host/linux-x86/testcases/ &
out/host/linux-x86/cts/android-cts/testcases/

Change-Id: I22a768dba58d40be1e61885534fb813e7ff08c99
2017-02-08 15:53:32 -08:00
Simran Basi
e9f1a266c9 Merge "Output *TS testcases to common testcase folders." am: 469c458279 am: 040b876e3e
am: d006a8be91

Change-Id: I129e04b61fd0492c3206b45654f842142bbecfb4
2017-02-08 20:14:17 +00:00
Simran Basi
d006a8be91 Merge "Output *TS testcases to common testcase folders." am: 469c458279
am: 040b876e3e

Change-Id: I8786ec11f866865a2be1cdcc67971573b2c96ef6
2017-02-08 19:27:40 +00:00
Treehugger Robot
469c458279 Merge "Output *TS testcases to common testcase folders." 2017-02-08 19:21:13 +00:00
Jayant Chowdhary
2dd9441b18 Merge "Add RenderScript Toolchain information to Soong." am: 9b49502b95 am: 14316678df
am: 9e3ad408bc

Change-Id: I6468b9fc5e92f03c4780c5dc23f3ab3aef98b4e0
2017-02-08 18:32:08 +00:00
Jayant Chowdhary
9e3ad408bc Merge "Add RenderScript Toolchain information to Soong." am: 9b49502b95
am: 14316678df

Change-Id: I1e1313599f42ff02e9d6d8c3792a2e79d2d01783
2017-02-08 18:25:08 +00:00
Jayant Chowdhary
9b49502b95 Merge "Add RenderScript Toolchain information to Soong." 2017-02-08 17:45:38 +00:00
Simran Basi
7166d1f43a Output *TS testcases to common testcase folders.
Aggregates the different *TS testcases into two common folders,
one under each the host and product hierarchies.

Bug: 34715822
Test: `make cts -j` and checked the contents of both:
out/host/linux-x86/testcases/ &
out/host/linux-x86/cts/android-cts/testcases/

Change-Id: I7d5201998ddcb011ecc687c272a0d0a36da248b7
2017-02-07 14:49:06 -08:00
Dan Willemsen
9c2e892f4c Merge "Add USE_SOONG_UI to trigger soong_ui in Make mode" am: 86a1c9f916 am: 807f6927c7
am: b2d74278a7

Change-Id: I559840491703444c9b20e47397b57a8a1d78b48b
2017-02-07 02:28:35 +00:00
Dan Willemsen
b2d74278a7 Merge "Add USE_SOONG_UI to trigger soong_ui in Make mode" am: 86a1c9f916
am: 807f6927c7

Change-Id: I6f1e30f9243c2d21eaadc710fec2955af070bb52
2017-02-07 02:26:05 +00:00
Dan Willemsen
3eb10cf6fa Add USE_SOONG_UI to trigger soong_ui in Make mode
Test: USE_SOONG_UI=true m -j
Change-Id: Ic7a0b4e0881757b0324722d7d316fb8d13dabd9b
2017-02-06 15:04:40 -08:00
Colin Cross
b64f3908c1 Merge "Create static archives in temporary file" am: 2eca5d30df am: 0cbb3086de
am: af87d8d1c5

Change-Id: Idc1fffd0c20dc1e667b974b558daf6770f1c3190
2017-02-06 21:28:46 +00:00
Colin Cross
af87d8d1c5 Merge "Create static archives in temporary file" am: 2eca5d30df
am: 0cbb3086de

Change-Id: Ie76b3d7395fd1fce54d35dcf98d9c3873fa359d8
2017-02-06 21:26:16 +00:00
Colin Cross
2eca5d30df Merge "Create static archives in temporary file" 2017-02-06 21:19:22 +00:00
Dan Albert
3bb28719cf Merge "Add c_std and cpp_std properties." am: 220ca4d04b am: 66496c4b96
am: 492a5ff3eb

Change-Id: I996cd253525cd5a70ba56432ae1d299abce7f2a4
2017-02-06 19:27:44 +00:00
Dan Albert
492a5ff3eb Merge "Add c_std and cpp_std properties." am: 220ca4d04b
am: 66496c4b96

Change-Id: I88fe9bebf9f389717135a9137762dd932ab7a139
2017-02-06 19:25:38 +00:00
Treehugger Robot
220ca4d04b Merge "Add c_std and cpp_std properties." 2017-02-06 19:18:27 +00:00
Paul Duffin
a01bf0ad27 Merge "Revert "Remove legacy-test from TARGET_DEFAULT_JAVA_LIBRARIES"" am: 7514ff26ca am: 8ac87364ff
am: 5c2f9714ba

Change-Id: I86869e79276554fa7bef0b2d7555108126118c34
2017-02-06 15:12:22 +00:00
Paul Duffin
5c2f9714ba Merge "Revert "Remove legacy-test from TARGET_DEFAULT_JAVA_LIBRARIES"" am: 7514ff26ca
am: 8ac87364ff

Change-Id: I27a233c7fc82836560b346330a895a1205ab9ff4
2017-02-06 15:10:22 +00:00
Paul Duffin
7514ff26ca Merge "Revert "Remove legacy-test from TARGET_DEFAULT_JAVA_LIBRARIES"" 2017-02-06 15:03:14 +00:00
Paul Duffin
fc3d49651d Revert "Remove legacy-test from TARGET_DEFAULT_JAVA_LIBRARIES"
This reverts commit 01fc887a07.

A number of build breakages occurred which were not caused by presubmit checks.

Change-Id: I1351dba594c8a8b210416f75a67c68554d5b9372
2017-02-06 14:58:02 +00:00
Paul Duffin
21ae00e419 Merge "Remove legacy-test from TARGET_DEFAULT_JAVA_LIBRARIES" am: bdf9ed17a0 am: cf877274e1
am: cf5cc1950a

Change-Id: I7bf48b246dfb0a825b7adf9e03019d3cf73c1cc5
2017-02-06 13:04:14 +00:00
Paul Duffin
cf5cc1950a Merge "Remove legacy-test from TARGET_DEFAULT_JAVA_LIBRARIES" am: bdf9ed17a0
am: cf877274e1

Change-Id: I9867a1290cced2fc378000e0effbab875a49c0a4
2017-02-06 13:02:15 +00:00
Paul Duffin
bdf9ed17a0 Merge "Remove legacy-test from TARGET_DEFAULT_JAVA_LIBRARIES" 2017-02-06 12:55:21 +00:00
Dan Albert
76bfcd4ab2 Add c_std and cpp_std properties.
Test: Checked showcommands ouput for each setting.
Bug: None
Change-Id: Ibc25f3977eaaecfd1fb99a27c9e15acae0ec4106
2017-02-03 16:43:06 -08:00
Evgenii Stepanov
7304ebafbe Merge "Disable CFI on Mips and add -march to linkflags on ARM." am: 1604b38040 am: 7cf1fc7661
am: cdd66fb8f2

Change-Id: I2e7c67e4014e1147d018565e171a615b2ad16f10
2017-02-04 00:23:01 +00:00
Evgenii Stepanov
cdd66fb8f2 Merge "Disable CFI on Mips and add -march to linkflags on ARM." am: 1604b38040
am: 7cf1fc7661

Change-Id: I6a8702e71a38770aa38ee62c9e82e534325055f6
2017-02-04 00:20:01 +00:00
Evgenii Stepanov
1604b38040 Merge "Disable CFI on Mips and add -march to linkflags on ARM." 2017-02-04 00:04:22 +00:00
Colin Cross
e14d9b7f7e Create static archives in temporary file
Creating static archives is often a multi-command process due to
adding whole static libraires or hitting command line length limits.
If one of the intermediate commands fails, the output file may
already exist.  Unlike make, ninja has no option to delete output
files on failed builds, instead assuming all build commands will
produce their output file atomically
(https://github.com/ninja-build/ninja/issues/1135).

Change the static library rules to generate to a temporary file
that is then atomically moved into place as the output file.

Test: m -j checkbuild tests cts
Change-Id: I4faf269f0c8e313c738154870a5aa0b4774a72bc
2017-02-03 15:16:59 -08:00
Jayant Chowdhary
8c3c9b5ec2 Add RenderScript Toolchain information to Soong.
Test: make -j64 from top of the tree.

Change-Id: I230f8d1265a71344bba8883ee9bdf2de98fcd41f
2017-02-02 19:35:58 -08:00
Stephen Hines
635dfdc07a Merge "Switch to clang-3688880." am: d12816b100 am: 627565d961
am: 0341eb0a7c

Change-Id: I8bc2c8b92632a43371e313934368bda5dcb14e8f
2017-02-01 21:35:18 +00:00
Stephen Hines
0341eb0a7c Merge "Switch to clang-3688880." am: d12816b100
am: 627565d961

Change-Id: Ibb8701553a6d548da1ac50ac38c19da71f412ac0
2017-02-01 21:32:43 +00:00
Stephen Hines
d12816b100 Merge "Switch to clang-3688880." 2017-02-01 21:25:03 +00:00
Evgenii Stepanov
8c50e3c4a8 Disable CFI on Mips and add -march to linkflags on ARM.
Mips toolchain does not have ld.gold.
ARM change is a workaround for LLVM r290384.

Bug: 33678192
Test: make ENABLE_CFI=1
Change-Id: I77a127e0b472d5da10bf45a2983527a714339cb8
2017-02-01 12:13:06 -08:00
Baligh Uddin
39eb5eec11 Remove -host am: a6b90881ca am: ee0dd8d577
am: 69164e78cb

Change-Id: Ia8f618fb86fc7ec9a7fb86e45af1a4aa3a7941dd
2017-02-01 19:46:17 +00:00
Baligh Uddin
e3c6fe223c Add libext2_misc to otatools package am: 96755d1296 am: f975623492
am: d4d96f3eee

Change-Id: I593a4ac7ea49b920fcfecad9672edb05d4305a8c
2017-02-01 19:46:10 +00:00
Baligh Uddin
69164e78cb Remove -host am: a6b90881ca
am: ee0dd8d577

Change-Id: Ibca12230dd969a4ab7267f7a971ca38660ba45e6
2017-02-01 19:39:49 +00:00
Baligh Uddin
d4d96f3eee Add libext2_misc to otatools package am: 96755d1296
am: f975623492

Change-Id: I065efaca6c5d8fad1989a97eab3b44c201e5cfe5
2017-02-01 19:39:40 +00:00
Baligh Uddin
a6b90881ca Remove -host
Bug: 34689537
Change-Id: Idd6b24a14caa863857303633ba15bd3b41a3a624
(cherry picked from commit b24470e989)
2017-02-01 09:34:41 -08:00
Baligh Uddin
96755d1296 Add libext2_misc to otatools package
Bug: 34689537
Change-Id: I4323acdbadb1c4c8faa6dbb17a79bce72c063407
(cherry picked from commit 3d1ce3a640)
2017-02-01 09:34:06 -08:00
Stephen Hines
40038d8451 Switch to clang-3688880.
Bug: http://b/31532493
Test: Manual validation.
Change-Id: I7c415a1008c368a4b65bac2b5cd3ded3f4bb9de0
2017-01-31 12:12:55 -08:00