OSDN Git Service
Tao Bao [Tue, 28 Feb 2017 19:48:48 +0000 (11:48 -0800)]
releasetools: Add support for --override_timestamp.
We use the timestamps in builds to determine a downgrade, which might
not be always the truth. For examples, two builds cut from different
branches may carry timestamps in a reverse order. An incremental package
won't be able to be pushed nor applied, based on the timestamp
comparison.
We used to handle such a case with manual work, by setting the
post-timestamp to (pre-timestamp + 1) in the package metadata. This CL
automates the process by adding a new flag --override_timestamp.
Note that it doesn't change anything in the installed image, but only
affects the assertions for pushing / installing the package.
With the change in this CL:
- If it's a downgrade without any extra flag, fail the package
generation (we only print warnings prior to this CL);
- If it's a downgrade with --downgrade flag, generate a downgrade
package with forced data wipe (same as before);
- If it's a downgrade with --override_timestamp, generate a normal
incremental with hacked timestamp (pre-timestamp + 1) (new in this CL
to avoid the manual change);
- If it's not a downgrade but with any of the above two flags specified,
fail the package generation.
Bug:
33744169
Test: Generate an incremental from builds with reversed timestamps.
Change-Id: I8b187d32708b4a7c3e20f8c6adb8f9527b73b965
Treehugger Robot [Tue, 28 Feb 2017 18:05:15 +0000 (18:05 +0000)]
Merge "Remove the backwards compatibility support for misc_info.txt."
Treehugger Robot [Tue, 28 Feb 2017 02:06:56 +0000 (02:06 +0000)]
Merge "Support path exclusion for native coverage."
Tao Bao [Mon, 27 Feb 2017 23:12:05 +0000 (15:12 -0800)]
Remove the backwards compatibility support for misc_info.txt.
We introduced META/misc_info.txt to hold the misc info since Gingerbread
(commit
37974731fcb4e32b1de5f213d34bd832ca889869). Remove the backwards
compatibility support for building pre-G TF zips.
Test: `m dist` works.
Change-Id: Ibff7aaf69cc7e460634c049d11a004f7196f8f73
Treehugger Robot [Mon, 27 Feb 2017 23:20:58 +0000 (23:20 +0000)]
Merge "Make secilc available"
Alex Klyubin [Mon, 27 Feb 2017 19:04:30 +0000 (11:04 -0800)]
Make secilc available
The SELinux policy compiler needs to be available on-device to compile
SELinux policy at boot on some devices. For now, we're including this
unconditionally, but, going forward, we will include this binary only
on devices which need it.
Test: Device boots -- secilc is not yet used anyway
Bug:
31363362
Change-Id: I7712b70d7c5b4c57bec2cdb44519b42d26758d09
Ryan Campbell [Mon, 27 Feb 2017 17:09:16 +0000 (09:09 -0800)]
Support path exclusion for native coverage.
Specify list of paths to exclude from coverage instrumentation.
Test: make NATIVE_COVERAGE=true COVERAGE_PATHS=hardware/interfaces
COVERAGE_EXCLUDE_PATHS=hardware/interfaces/graphics
Bug:
35769817
Change-Id: I3747fdddb381101b9ebf51909b9686e820148aad
Treehugger Robot [Sun, 26 Feb 2017 21:31:23 +0000 (21:31 +0000)]
Merge "releasetools: Fix an equality check bug when asserting stash size."
Tao Bao [Sun, 26 Feb 2017 18:48:11 +0000 (10:48 -0800)]
releasetools: Fix an equality check bug when asserting stash size.
Otherwise the comparison is inconsistent between ReviseStashSize() and
WriteTransfers().
Bug:
35775675
Test: Successfully generate a previously failed incremental.
Change-Id: I554a51a210bf322cb5c79e28cf85607a417b094a
Treehugger Robot [Sat, 25 Feb 2017 01:34:30 +0000 (01:34 +0000)]
Merge "Port java.mk desugar changes to host_dalvik_java_library.mk"
Treehugger Robot [Sat, 25 Feb 2017 01:00:18 +0000 (01:00 +0000)]
Merge "Add a script to check OWNERS file syntax."
Colin Cross [Fri, 24 Feb 2017 22:06:29 +0000 (14:06 -0800)]
Port java.mk desugar changes to host_dalvik_java_library.mk
host_dalvik_java_library.mk shares less of the implementation
with the device side than I thought, port the desugar changes
from java.mk.
Test: m -j ANDROID_FORCE_JACK_ENABLED=disabled core-oj-hostdex
Change-Id: I5e09673c5eae6bf95d63540e7b626c67da87e9f1
Chih-Hung Hsieh [Thu, 23 Feb 2017 00:14:48 +0000 (16:14 -0800)]
Add a script to check OWNERS file syntax.
* -v option to print found files and email addresses.
* -c option to check found email addresses.
Bug:
33166666
Test: ./checkowners.py -v -c `find . -name OWNERS`
Change-Id: I32f23f19e904055e421ddec713536c8a5c970af4
Josh Gao [Fri, 24 Feb 2017 21:02:23 +0000 (21:02 +0000)]
Merge "Statically link libwinpthread into windows binaries."
Dan Willemsen [Fri, 24 Feb 2017 17:50:13 +0000 (17:50 +0000)]
Merge "Add progress indicator to Android.mk includes"
Tao Bao [Fri, 24 Feb 2017 17:41:32 +0000 (17:41 +0000)]
Merge "Make the packaging of VBOOT_SIGNER tools conditional."
Josh Gao [Thu, 23 Feb 2017 21:17:46 +0000 (13:17 -0800)]
Statically link libwinpthread into windows binaries.
Statically link libwinpthread.a, so that we don't have to ship a
libwinpthread dll with all of our windows exectuables.
Bug: http://b/
31665213
Test: wine adb.exe
Test: wine fastboot.exe
Change-Id: I96414e980d8894f8f6a58c1c7bbd9dc5e0f5169c
Tao Bao [Thu, 23 Feb 2017 00:38:19 +0000 (16:38 -0800)]
Make the packaging of VBOOT_SIGNER tools conditional.
Otherwise it may fail the targets that don't have
external/vboot_reference in the manifest.
Bug:
35467608
Test: lunch aosp_dragon-userdebug; m otatools-package
Test: lunch aosp_bullhead-userdebug; m otatools-package
Change-Id: I35700a4d7d0723992badcfb4a03be85d07a4b9a9
Treehugger Robot [Thu, 23 Feb 2017 19:16:06 +0000 (19:16 +0000)]
Merge "Remove cpusets and schedboost product variables"
Tao Bao [Thu, 23 Feb 2017 18:47:11 +0000 (18:47 +0000)]
Merge "Makefile: Add the missing dependency on FUTILITY."
Colin Cross [Thu, 23 Feb 2017 18:18:37 +0000 (18:18 +0000)]
Merge "Pass min sdk version to dx and desugar"
Colin Cross [Thu, 23 Feb 2017 17:45:33 +0000 (09:45 -0800)]
Remove cpusets and schedboost product variables
They are no longer needed, remove them.
Bug:
35129304
Bug:
35128496
Test: builds
Change-Id: Ic0bb04f80d78a1aef2adfeb2af816eecabdbc4ba
Tao Bao [Thu, 23 Feb 2017 06:54:39 +0000 (22:54 -0800)]
Makefile: Add the missing dependency on FUTILITY.
Bug:
35467608
Test: lunch aosp_dragon-userdebug; m dist
Change-Id: If3824ac22926f3c3cc09d5b82cb0f6da4132f937
Colin Cross [Thu, 23 Feb 2017 02:12:25 +0000 (02:12 +0000)]
Merge "Don't duplicate default platform libraries into proguard flags"
Colin Cross [Wed, 22 Feb 2017 22:26:55 +0000 (14:26 -0800)]
Don't duplicate default platform libraries into proguard flags
Test: builds
Change-Id: Ib972d954972614f3e6ce522c58fce06beeda3cea
Treehugger Robot [Wed, 22 Feb 2017 19:35:46 +0000 (19:35 +0000)]
Merge "Add device-tests and general-tests make targets."
Dan Willemsen [Sat, 18 Feb 2017 18:41:30 +0000 (10:41 -0800)]
Add progress indicator to Android.mk includes
Test: m -j
Change-Id: I1e6fd020a06b49c243be14953d9f417e64ac7b8b
Colin Cross [Wed, 22 Feb 2017 00:14:55 +0000 (16:14 -0800)]
Pass min sdk version to dx and desugar
Test: make checkbuild
Change-Id: Idde9712508571ea623126c7d25d2fa67eccf4833
Paul Duffin [Wed, 22 Feb 2017 12:15:26 +0000 (12:15 +0000)]
Merge "Filter JUnit and android.test classes from applications using proguard"
Treehugger Robot [Wed, 22 Feb 2017 04:25:48 +0000 (04:25 +0000)]
Merge "Use ifndef or ifeq () instead of ifeq """
Treehugger Robot [Wed, 22 Feb 2017 03:27:20 +0000 (03:27 +0000)]
Merge "Wait for children to exit in makeparallel"
Dan Willemsen [Wed, 22 Feb 2017 00:27:23 +0000 (16:27 -0800)]
Wait for children to exit in makeparallel
This is a partial revert to the last makeparallel change, since now we
were being killed by the signal before waiting for our child to exit. So
instead of not installing the handlers, only pass the signal along if
it's a SIGTERM.
Bug:
35214134
Test: Ensure that we're still only getting one signal for SIGINT
Test: Ctrl-C, ensure that all the soong_ui lines are before the make
error line.
Change-Id: I26fff9483a3abfd79ceb5a9ea47e3f7572d9e923
Colin Cross [Wed, 22 Feb 2017 01:23:02 +0000 (17:23 -0800)]
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
Simran Basi [Thu, 16 Feb 2017 19:49:18 +0000 (11:49 -0800)]
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
Treehugger Robot [Wed, 22 Feb 2017 00:54:03 +0000 (00:54 +0000)]
Merge "Stop double-printing config"
Colin Cross [Tue, 21 Feb 2017 23:25:05 +0000 (23:25 +0000)]
Merge "Revert "Replace hardware features conf file to be emulator specific""
Treehugger Robot [Tue, 21 Feb 2017 23:22:31 +0000 (23:22 +0000)]
Merge "Prevent duplicate signals from makeparallel"
Dan Willemsen [Sat, 18 Feb 2017 18:32:13 +0000 (10:32 -0800)]
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
Dan Willemsen [Tue, 21 Feb 2017 21:43:23 +0000 (13:43 -0800)]
Prevent duplicate signals from makeparallel
As part of the soong_ui effort, we noticed that we'd sometimes see
multiple SIGINTs from a single ctrl-c from a user. ctrl-c sends a SIGINT
to the entire process group, so make, makeparallel, soong_ui, and all of
its children would get a signal. Since makeparallel was passing it along
to it's child, soong_ui would get two signals.
So instead, follow what Make does and only pass along SIGTERM. Assume
that all other signals went to the entire process group.
Bug:
35214134
Test: Send SIGINT to process group, check in makeparallel's child for
more than one signal received.
Change-Id: I5b2a77ad0fcebbaa5087439948e71bf3b541061a
Treehugger Robot [Tue, 21 Feb 2017 18:23:15 +0000 (18:23 +0000)]
Merge "releasetools: allow for multiple OEM property values."
Alain Vongsouvanh [Thu, 16 Feb 2017 21:06:55 +0000 (13:06 -0800)]
releasetools: allow for multiple OEM property values.
This CL changes the --oem_settings flag to allow a comma seperated list of
property files. All property values will be used when asserting properties such
as ro.product.name.
For example, if two property files are provided with ro.product.name values of
"sprout" and "sprout_a", the resulting otapackage will check that the device's
ro.product.name property matches at least one of them.
Bug:
34191373
Test: manual
Change-Id: I954673511be8f0929982235cc9cbfbd85a9ee1f4
Paul Duffin [Tue, 21 Feb 2017 13:11:13 +0000 (13:11 +0000)]
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
Paul Duffin [Mon, 20 Feb 2017 11:51:00 +0000 (11:51 +0000)]
Merge "2nd attempt to remove legacy-test from TARGET_DEFAULT_JAVA_LIBRARIES"
Treehugger Robot [Mon, 20 Feb 2017 06:56:14 +0000 (06:56 +0000)]
Merge "Revert "Revert "Add soong_javac_filter to all javac commands"""
Colin Cross [Mon, 20 Feb 2017 03:51:27 +0000 (19:51 -0800)]
Revert "Revert "Add soong_javac_filter to all javac commands""
This reverts commit
52d2253ff9617e0c1ad767274e8627c39776198a.
Test: pipe the grok build output through soong_javac_filter
Change-Id: I449a61ed2c95b3e1afd51a31a11baab15d97e2f2
Treehugger Robot [Sun, 19 Feb 2017 06:22:25 +0000 (06:22 +0000)]
Merge "Disable building coverage with javac"
Tao Bao [Sat, 18 Feb 2017 22:53:53 +0000 (22:53 +0000)]
Merge "releasetools: Allow using futility-host to sign old TF.zip."
Colin Cross [Sat, 18 Feb 2017 20:05:24 +0000 (20:05 +0000)]
Revert "Replace hardware features conf file to be emulator specific"
This reverts commit
a118a21b009e09514f7b245f60ac4139217ce0ce.
Change-Id: I2c4140667a2c00abad3c6337c680542070dd7caa
Colin Cross [Sat, 18 Feb 2017 07:43:45 +0000 (23:43 -0800)]
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
Tao Bao [Sat, 18 Feb 2017 07:21:31 +0000 (23:21 -0800)]
releasetools: Allow using futility-host to sign old TF.zip.
Commit
e98fb7a8d3a460891f6c21fafbe62a86b50d3d1d switched to using
futility-host instead of the prebuilt futility. This CL adds support to
handle signing old TF.zip that still says "futility=prebuilt/..." in
META/misc_info.txt.
Bug:
35467608
Test: Generate otatools.zip and sign an old ryu TF.zip.
Change-Id: I48a9cc918c7afce361e1ec9bc4f85f74fa92566e
Treehugger Robot [Sat, 18 Feb 2017 01:49:06 +0000 (01:49 +0000)]
Merge "embedded.mk: allocator service"
Treehugger Robot [Sat, 18 Feb 2017 01:35:39 +0000 (01:35 +0000)]
Merge "Build all the way to classes.dex for checkbuild"
Colin Cross [Sat, 18 Feb 2017 01:10:08 +0000 (01:10 +0000)]
Merge "Add a desugar step between javac and proguard"
Tao Bao [Sat, 18 Feb 2017 01:04:30 +0000 (01:04 +0000)]
Merge "Build FUTILITY tool from futility-host."
Treehugger Robot [Sat, 18 Feb 2017 00:12:41 +0000 (00:12 +0000)]
Merge "Remove unused zipalign macros"
Dan Willemsen [Fri, 17 Feb 2017 23:50:41 +0000 (23:50 +0000)]
Merge "Add Header Library support to Make"
Treehugger Robot [Fri, 17 Feb 2017 23:20:23 +0000 (23:20 +0000)]
Merge "Replace hardware features conf file to be emulator specific"
Colin Cross [Tue, 31 Jan 2017 01:09:56 +0000 (17:09 -0800)]
Build all the way to classes.dex for checkbuild
Test: m -j checkbuild
Change-Id: Ie1b7be01c9bbcf1a32399f19d050a93410bdb42b
Colin Cross [Thu, 22 Dec 2016 01:11:03 +0000 (17:11 -0800)]
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
Colin Cross [Fri, 17 Feb 2017 22:54:06 +0000 (22:54 +0000)]
Merge "Revert "Add soong_javac_filter to all javac commands""
Colin Cross [Fri, 17 Feb 2017 22:53:42 +0000 (22:53 +0000)]
Revert "Add soong_javac_filter to all javac commands"
This reverts commit
a341bf0f8636ec42bd87058d9ba31a482cea3b6d.
Breaks grok builds that replace javac with another tool:
reading standard input: bufio.Scanner: token too long
Change-Id: I825587c465b05c1fbddb7794dc1c84f5f2c883d1
Colin Cross [Fri, 17 Feb 2017 22:19:08 +0000 (22:19 +0000)]
Merge changes I7e8fcd2e,Ie12d743c
* changes:
Add soong_javac_filter to all javac commands
Re-enable dx support
Tao Bao [Fri, 17 Feb 2017 22:11:13 +0000 (14:11 -0800)]
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
Pulkit Bhuwalka [Wed, 15 Feb 2017 05:46:47 +0000 (21:46 -0800)]
Replace hardware features conf file to be emulator specific
full_base_telephoney.mk file gets used only for emulators which should
have bluetooth disabled. Using the default handheld_core_hardware.xml
file has bluetooth enabled. We should use the generic
handheld_core_hardware.xml file for emulators which has bluetooth
disabled.
Its presence causes problems upstream in SystemServer when
BluetoothService starts and requires an extra emulator config change
which should not be there.
Bug:
35361545
Test: Verified by launching Android Emulator. It works fine and does not
start bluetooth.
Change-Id: I484c3d5867f46853fb49f28422dd72ab362ed768
Steven Moreland [Thu, 16 Feb 2017 23:59:52 +0000 (15:59 -0800)]
embedded.mk: allocator service
We are splitting android.hidl.memory into android.hidl.allocator and
android.hidl.memory to reflect the fact that we have two separate
interfaces which are served over different transports.
Bug:
35327976
Test: hidl_test, device boots with allocator
Merged-In: I36b1554d20f89ecd60a836c04f788ac83e0a1f5c
Change-Id: I36b1554d20f89ecd60a836c04f788ac83e0a1f5c
Dan Willemsen [Fri, 17 Feb 2017 18:28:53 +0000 (10:28 -0800)]
Remove unused zipalign macros
Test: codesearch
Test: build-marlin.ninja is identical before/after (in internal master)
Change-Id: I1c5c39cabcc166b8e8608ace3290b7027d258624
Narayan Kamath [Fri, 17 Feb 2017 14:07:33 +0000 (14:07 +0000)]
Merge "zipalign: remove support for adding members from gzip sources."
Treehugger Robot [Fri, 17 Feb 2017 03:34:00 +0000 (03:34 +0000)]
Merge "Set IS_AT_LEAST_* variables based on TARGET_PLATFORM_VERSION"
Colin Cross [Fri, 17 Feb 2017 00:41:26 +0000 (16:41 -0800)]
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
Colin Cross [Wed, 15 Feb 2017 21:42:44 +0000 (13:42 -0800)]
Add soong_javac_filter to all javac commands
soong_javac_filter colorizes javac output, and hides noisy messages.
Test: builds
Change-Id: I7e8fcd2e4e1ed3ff530a8ccfe931ceb7e411e0ad
Colin Cross [Wed, 21 Dec 2016 22:29:13 +0000 (14:29 -0800)]
Re-enable dx support
This is a partial revert of commits:
858657366fa6 Remove support of disabling Jack.
3ae78612522e Remove javac support in host dex rules.
22313f2b2a4a Remove rules for building dex with dx
Test: builds
Change-Id: Ie12d743cbe978bdeb030910848b67f5945a4fec8
Narayan Kamath [Thu, 16 Feb 2017 10:53:09 +0000 (10:53 +0000)]
zipalign: remove support for adding members from gzip sources.
This was vestigial code and never actually called anywhere.
Test: make
Bug:
35246701
Change-Id: I9297ac5fa030d369946857414155450635b65410
Dan Willemsen [Wed, 15 Feb 2017 23:48:11 +0000 (15:48 -0800)]
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
Treehugger Robot [Wed, 15 Feb 2017 22:52:45 +0000 (22:52 +0000)]
Merge "Blacklist code for CFI."
Vishwath Mohan [Tue, 14 Feb 2017 15:55:37 +0000 (07:55 -0800)]
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
Treehugger Robot [Wed, 15 Feb 2017 00:45:18 +0000 (00:45 +0000)]
Merge "Fix init rc installation in vendor when LOCAL_MODULE_PATH is set"
Dan Willemsen [Wed, 15 Feb 2017 00:32:15 +0000 (00:32 +0000)]
Merge "Support Soong native coverage"
Paul Duffin [Wed, 21 Dec 2016 10:08:48 +0000 (10:08 +0000)]
2nd attempt to remove legacy-test from TARGET_DEFAULT_JAVA_LIBRARIES
Bug:
30188076
Test: make checkbuild
(cherry picked from commit
01fc887a07ed8d07f6e7cd75a812b90956543338)
Change-Id: I114948232fd63eaf57a777d37623e4c931bdd0ff
Treehugger Robot [Tue, 14 Feb 2017 02:06:01 +0000 (02:06 +0000)]
Merge "Improve installclean to catch more installed files"
Treehugger Robot [Tue, 14 Feb 2017 01:36:44 +0000 (01:36 +0000)]
Merge "Share *_OUT_TESTCASES environment variables with TF"
Colin Cross [Mon, 13 Feb 2017 22:38:27 +0000 (22:38 +0000)]
Merge "Don't build tests in normal builds"
Tao Bao [Mon, 13 Feb 2017 22:29:40 +0000 (22:29 +0000)]
Merge "releasetools: Fix a bug in ReviseStashSize()."
Dan Willemsen [Mon, 13 Feb 2017 21:41:43 +0000 (13:41 -0800)]
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
Simran Basi [Mon, 13 Feb 2017 21:46:48 +0000 (13:46 -0800)]
Share *_OUT_TESTCASES environment variables with TF
Instead of having test tools search the OUT_DIR for the
testcases folders (of which there can be multiple different
targets), let's have these variables become part of the runtime
environment after a developer has run lunch.
Bug:
35322559
Test: . build/envsetup.sh ; lunch ; printenv | grep TESTCASES
Change-Id: Ic4addc2b9727ff717b2e595b9be224650e2f1b1d
Dan Willemsen [Sat, 11 Feb 2017 00:44:10 +0000 (16:44 -0800)]
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
Treehugger Robot [Mon, 13 Feb 2017 20:52:30 +0000 (20:52 +0000)]
Merge "fat16copy: Allow to copy files to an existing directory."
Vishwath Mohan [Mon, 13 Feb 2017 20:49:19 +0000 (20:49 +0000)]
Merge "Disble CFI for ARM32 processes."
Tao Bao [Mon, 13 Feb 2017 19:42:50 +0000 (11:42 -0800)]
releasetools: Fix a bug in ReviseStashSize().
We check the needed stash size in ReviseStashSize(), and may not
generate a stash command if it would exceed the max allowed size. This
CL fixes a bug when skipping a stash operation: we shouldn't update the
'stashes' map if a stash command won't be generated.
Bug:
35313668
Test: Successfully generate the package that was failing due to the bug.
Change-Id: If0a3a5fadda9b4a4edad66a2a5826b5f978400ae
Alex Deymo [Mon, 13 Feb 2017 16:01:34 +0000 (16:01 +0000)]
Merge "Include the LOCAL_REQUIRED_MODULES when packaging."
Alex Deymo [Tue, 31 Jan 2017 23:23:29 +0000 (15:23 -0800)]
fat16copy: Allow to copy files to an existing directory.
This patch re-uses existing directories when copying directories,
allowing to copy files to a directory previously created.
Bug:
34811400
Test: fat16copy.py fat.bin a/b/foo; fat16copy.py fat.bin c/d/foo
(cherry-picked from
0af24a27a8d0dc7e1782f36a5a9963021ff8b3f6)
Change-Id: I283184da18f3c4951d6c84aafa4185074791acd2
Simran Basi [Sat, 11 Feb 2017 00:18:18 +0000 (00:18 +0000)]
Merge "Update CleanSpec.mk for the common testcase directories."
Mathieu Chartier [Sat, 11 Feb 2017 00:05:02 +0000 (00:05 +0000)]
Merge "Add support for preopted app images"
Simran Basi [Fri, 10 Feb 2017 23:40:43 +0000 (15:40 -0800)]
Update CleanSpec.mk for the common testcase directories.
Fix an issue with incremental builds and the new common
testcase directories.
Bug: None
Test: Removed https://android-review.googlesource.com/#/c/234478/
then ran `m cts-platform-version-check` then reapplied the
change to verify the failure. Then applied this new change
to verify the problem was resolved.
Change-Id: I77529021e852af35571fb99537d87100010b47af
Mathieu Chartier [Thu, 9 Feb 2017 02:30:31 +0000 (18:30 -0800)]
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
e8ab2a71d7bff1047c3d0497feba6bdcc02b8277)
Change-Id: I63f98a85c69d99746b11bb6e85c23cf5e48910cf
Treehugger Robot [Fri, 10 Feb 2017 21:11:58 +0000 (21:11 +0000)]
Merge "Output *TS testcases to their own subdir in the common testcase folders."
Dan Willemsen [Fri, 10 Feb 2017 08:07:17 +0000 (00:07 -0800)]
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
Treehugger Robot [Fri, 10 Feb 2017 00:53:23 +0000 (00:53 +0000)]
Merge "Remove mk file parser variables that are no longer required by system/bt"
Treehugger Robot [Fri, 10 Feb 2017 00:14:45 +0000 (00:14 +0000)]
Merge "Sort clear_vars.mk again"
Dan Willemsen [Thu, 9 Feb 2017 22:28:22 +0000 (14:28 -0800)]
Sort clear_vars.mk again
Test: none
Change-Id: Id776e81977695c4b488f44b155f2c098d5f8b61a
Jack He [Thu, 9 Feb 2017 22:28:00 +0000 (14:28 -0800)]
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