OSDN Git Service
Dan Willemsen [Mon, 21 Mar 2016 21:09:40 +0000 (21:09 +0000)]
Merge "Always run Soong"
David Zeuthen [Mon, 21 Mar 2016 15:46:29 +0000 (15:46 +0000)]
Merge "Add support for Brillo Verified Boot."
Pirama Arumuga Nainar [Fri, 18 Mar 2016 21:54:50 +0000 (21:54 +0000)]
Merge changes from topic 'rebase_r256229'
* changes:
Switch to clang-
2690385
Update RenderScript build rules for rebase to LLVM r256229
David Zeuthen [Fri, 29 Jan 2016 21:59:17 +0000 (16:59 -0500)]
Add support for Brillo Verified Boot.
The following variables are introduced
BOARD_BVB_ENABLE: can be set to true to build boot.img and system.img
files compatible with Brillo Verfied Boot.
BOARD_BVB_ROLLBACK_INDEX: can be set to an integer to use for the
rollback index.
BOARD_BVB_KEY_PATH, BOARD_BVB_ALGORITHM: If set, the former must be a
path to the private key used to sign the boot image and the latter must
be the algorithm to use. If unset, a test-key stored in the tree will
be used.
BOARD_BVB_MAKE_BOOT_IMAGE_ARGS: Extra options to pass to 'bvbtool
make_boot_image'.
BOARD_BVB_SIGN_BOOT_IMAGE_ARGS: Extra options to pass to 'bvbtool
sign_boot_image'.
BOARD_BVB_ADD_IMAGE_HASHES_ARGS: Extra options to pass to 'bvbtool
add_image_hashes'.
BOARD_CUSTOM_BVBTOOL: Can be set to specify what bvbtool program to
use.
The existing BOARD_KERNEL_CMDLINE variable is also used, as are existing
kernel and initrd-related variables. Therefore, simply adding
BOARD_BVB_ENABLE := true
to an existing Makefile should do the trick.
Bug:
26185038
TEST=Added 'BOARD_BVB_ENABLE := true' to hardware/bsp/intel/soc/edison/soc.mk
and built an image and then ran bvbtool's info_boot_image and
info_image_hashes commands on the resulting boot.img and system.img
files and verified that the information was correct. Also ran 'm dist'
and verified that the boot.img and system.img files in the resulting
target_files.zip file had similar information.
Change-Id: I08045ed8b0cbddc7c3acdd3a6f2c4bb75cb44bbc
Ying Wang [Fri, 18 Mar 2016 17:37:17 +0000 (17:37 +0000)]
Merge "Enable -Werror on zipalign"
Ying Wang [Fri, 18 Mar 2016 17:04:07 +0000 (10:04 -0700)]
Enable -Werror on zipalign
And fix the last warning to enable this flag.
Bug:
27695718
Change-Id: I70eb9c87530a9b982fbe83abea706908f0ce0356
Yohann Roussel [Fri, 18 Mar 2016 13:50:55 +0000 (13:50 +0000)]
Merge "Remove rules for building dex with dx"
Yohann Roussel [Fri, 18 Mar 2016 08:54:29 +0000 (08:54 +0000)]
Merge "Remove JILL, JACK_JAR and JILL_JAR"
Dimitry Ivanov [Thu, 17 Mar 2016 22:53:57 +0000 (22:53 +0000)]
Merge "Add config file listing public native libraries"
Ying Wang [Thu, 17 Mar 2016 22:44:28 +0000 (22:44 +0000)]
Merge "Fix compilation warning."
Ying Wang [Thu, 17 Mar 2016 21:44:42 +0000 (14:44 -0700)]
Fix compilation warning.
Fix compilation warning:
" destination for this 'memcpy' call is a pointer to dynamic class
'CentralDirEntry'; vtable pointer will be overwritten"
by removing unnecessary virtual desctructor.
Bug:
27695718
Change-Id: Id3c451f82374f2232176115b7bc3291ac4275c00
Pirama Arumuga Nainar [Thu, 17 Mar 2016 18:06:51 +0000 (11:06 -0700)]
Switch to clang-
2690385
http://b/
26987366
Change-Id: I1226f24b50319e321ea538362b2f26fcd227ca39
Pirama Arumuga Nainar [Thu, 17 Mar 2016 18:04:37 +0000 (11:04 -0700)]
Update RenderScript build rules for rebase to LLVM r256229
http://b/
26987366
- Use clang-
2690385 to build RenderScript toolchain.
- Use armv7-linux-androideabi as the triple used to build RenderScript
runtime libraries.
Change-Id: I582e8b25bbc38b101a2e765028ed61edbce7bdc2
Sen Jiang [Thu, 17 Mar 2016 19:47:42 +0000 (19:47 +0000)]
Merge "Add zlib_fingerprint to target_files.zip"
Dimitry Ivanov [Wed, 16 Mar 2016 22:06:06 +0000 (15:06 -0700)]
Add config file listing public native libraries
This file contains list of libraries that should be directly or
indirectly accessible to apps for the platform. Note that this
file is not device specific but rather device class specific.
Bug: http://b/
27546414
Change-Id: Ica2e6c5cedac6e4af9bd78addaa512b2fa272d64
(cherry picked from commit
795132dccd954f5879b92b6c3a5137ce9b278ea3)
Chih-hung Hsieh [Thu, 17 Mar 2016 16:26:31 +0000 (16:26 +0000)]
Merge "Link in ASAN library if my_global_santitize is set."
Chih-hung Hsieh [Thu, 17 Mar 2016 16:01:27 +0000 (16:01 +0000)]
Merge "Classify more warning patterns."
Yohann Roussel [Thu, 17 Mar 2016 11:02:27 +0000 (12:02 +0100)]
Remove JILL, JACK_JAR and JILL_JAR
Also ensure that sdk.atree can find jack.jar and jill.jar from prebuilt.
Bug:
27372042
Change-Id: Ie266104e51c09fa21ccb09c1f27ad7068472965c
Chih-Hung Hsieh [Wed, 16 Mar 2016 19:18:16 +0000 (12:18 -0700)]
Classify more warning patterns.
Some warnings are from clang static analyzer
and they do not have compiler -W flag.
BUG:
27698849
Change-Id: I3d1fc9c2d6c60100e87f8ea201d3f8314370fccd
Dan Willemsen [Wed, 16 Mar 2016 20:14:27 +0000 (20:14 +0000)]
Merge "Add SOONG_ALLOW_MISSING_DEPENDENCIES"
Yohann Roussel [Wed, 16 Mar 2016 20:00:19 +0000 (20:00 +0000)]
Merge "Fix jack min sdk version for ub branches"
Dan Willemsen [Wed, 16 Mar 2016 18:12:41 +0000 (11:12 -0700)]
Add SOONG_ALLOW_MISSING_DEPENDENCIES
Split out Soong's missing dependency option from Unbundled_build. There
are builds other than unbundled builds that don't have a full platform
tree (AOSP llvm branch is one example).
When this is set to true, Soong will defer the error for missing
dependencies until a module is attempted to be built, instead of when
it is reading and generating the build rules. So for platform builds it
will still fail early if something is missing.
Change-Id: I56cb881ff55f5928b77cddc0d67086c3d37e43d7
Tao Bao [Wed, 16 Mar 2016 19:14:05 +0000 (19:14 +0000)]
Merge "Revert "Revert "releasetools: Support OTAs that have OEM properties changes."""
Sen Jiang [Tue, 8 Mar 2016 00:51:01 +0000 (16:51 -0800)]
Add zlib_fingerprint to target_files.zip
Test: make dist on edison-userdebug
Bug:
27156099
Change-Id: I4ba9095ecc5bb1730b8d0ba2d56d20fdbff3acaa
Yohann Roussel [Wed, 16 Mar 2016 16:18:32 +0000 (17:18 +0100)]
Fix jack min sdk version for ub branches
Bug:
27371864
(cherry picked from commit
d6101b678688bce96d67f8d945537f405f648194)
Change-Id: Idd926f5667fbe4275f8f1d80733b8c4471570874
Przemyslaw Szczepaniak [Wed, 16 Mar 2016 15:52:57 +0000 (15:52 +0000)]
Merge "Add java.util.stream to whitelisted packages"
Yohann Roussel [Wed, 16 Mar 2016 14:19:04 +0000 (14:19 +0000)]
Merge "Inform Jack of the min sdk"
Przemyslaw Szczepaniak [Wed, 16 Mar 2016 13:45:23 +0000 (13:45 +0000)]
Add java.util.stream to whitelisted packages
Bug:
27692239
Change-Id: I50e671222efc415fb930e5493f1943c5b8f6a71c
Yohann Roussel [Wed, 9 Mar 2016 16:19:58 +0000 (17:19 +0100)]
Inform Jack of the min sdk
Set Jack min sdk according to LOCAL_SDK_VERSION. Gives Jack current
version when LOCAL_SDK_VERSION is not available.
Bug:
27371864
Change-Id: I5db233fe09aed0fae37fe9a92658bc8f24b86cdf
Yohann Roussel [Wed, 16 Mar 2016 09:33:02 +0000 (10:33 +0100)]
Remove rules for building dex with dx
This is just to ensure no dex file is built with dx any more, cleaning
of the build rules from Jack optionality is still to be done.
Bug:
27218410
Change-Id: Iea2c66802b6c64c52690ad9d6d487bdce5f50b79
Sen Jiang [Wed, 16 Mar 2016 04:04:41 +0000 (04:04 +0000)]
Merge "Revert "Add zlib_fingerprint to target_files.zip""
Sen Jiang [Wed, 16 Mar 2016 03:38:29 +0000 (03:38 +0000)]
Revert "Add zlib_fingerprint to target_files.zip"
This reverts commit
d8c715bf34ca6f637d6b15c8cd50d666137d05a3.
Change-Id: Ie0c3c5b2db89fe076d678b67f013c20e836d825f
Sen Jiang [Wed, 16 Mar 2016 02:59:36 +0000 (02:59 +0000)]
Merge "Add zlib_fingerprint to target_files.zip"
Chih-Hung Hsieh [Wed, 9 Mar 2016 22:54:55 +0000 (14:54 -0800)]
Link in ASAN library if my_global_santitize is set.
* When my_global_santitize is set and requires ASAN,
link with ASAN library even when local module is not
instrumented with ASAN, unless the local module is
the ASAN library itself.
* Add -Wl,--as-needed to my_ldflags for shared libraries
so that unneeded ASAN library would not become
a dependent of the built .so file.
* Change shared file and executable file link argument order
so that -Wl flags will have effect on linked-in libraries.
* Remove unused ADDRESS_SANITIZER_CONFIG_EXTRA_SHARED_LIBRARIES.
BUG:
27614834
Change-Id: I4eda6003f1f24e498cba91c043dbe1fabe522686
Shinichiro Hamaji [Tue, 15 Mar 2016 23:00:11 +0000 (23:00 +0000)]
Merge "Replace last -includes by .KATI_DEPFILE"
Shinichiro Hamaji [Tue, 15 Mar 2016 21:40:04 +0000 (06:40 +0900)]
Replace last -includes by .KATI_DEPFILE
There was a typo in binary.mk. compile-dotdot-XXX-file in
definitions.mk was also using -include.
Bug:
26839129
Change-Id: I4a0145fb70413998cc65d30d2efcd68af07b4800
Tao Bao [Tue, 15 Mar 2016 20:20:19 +0000 (13:20 -0700)]
Revert "Revert "releasetools: Support OTAs that have OEM properties changes.""
This CL fixes the bug in [1] (copy-paste error) and reenables it.
We need to handle a special case that an OTA goes from a source build
without OEM properties to a target build with those properties (or vice
versa). Add support in OTA scripts to deal the case properly, by a)
using two oem_props variables to handle source and target builds
respectively; b) adjusting the fingerprint/thumbprint assertions to
allow a mix of both.
[1] commit
c086370440bb32501da427718a7313f12ec2c841
Change-Id: I98118d77d5a0ff694fa1ee33602b5ee5e048599b
Tao Bao [Tue, 15 Mar 2016 19:16:32 +0000 (19:16 +0000)]
Merge "Revert "releasetools: Support OTAs that have OEM properties changes.""
Tao Bao [Tue, 15 Mar 2016 19:16:18 +0000 (19:16 +0000)]
Revert "releasetools: Support OTAs that have OEM properties changes."
Broke some builds.
This reverts commit
c086370440bb32501da427718a7313f12ec2c841.
Change-Id: If07006db412fea6c04f8698776a2ab418125a469
Tao Bao [Tue, 15 Mar 2016 18:33:20 +0000 (18:33 +0000)]
Merge "releasetools: Support OTAs that have OEM properties changes."
Sami Tolvanen [Tue, 15 Mar 2016 17:37:27 +0000 (17:37 +0000)]
Merge "Revert "Revert "build: pass version and patch level to mkbootimg"""
Sami Tolvanen [Tue, 15 Mar 2016 16:49:30 +0000 (16:49 +0000)]
Revert "Revert "build: pass version and patch level to mkbootimg""
This reverts commit
494a9090f96a7fc4e77f8f4fbb26d876a5fc8438.
Bug:
27498078
Bug:
22914603
Change-Id: Iee6a784271ec32c6bfcc0a6ad3f0395d82016df3
Yohann Roussel [Tue, 15 Mar 2016 15:04:54 +0000 (15:04 +0000)]
Merge "Revert "Inform Jack of the min sdk""
Yohann Roussel [Tue, 15 Mar 2016 15:02:11 +0000 (15:02 +0000)]
Revert "Inform Jack of the min sdk"
This reverts commit
94451580af9c08e78ed347fb21b811049f8c96cb.
Bug:
27371864
Change-Id: I60a8c89b2ab8a6cbde4dd3b0aed24b71700815ab
Yohann Roussel [Tue, 15 Mar 2016 15:01:31 +0000 (15:01 +0000)]
Merge "Revert "Remove one debug line""
Yohann Roussel [Tue, 15 Mar 2016 14:51:28 +0000 (14:51 +0000)]
Revert "Remove one debug line"
This reverts commit
d2fafe57340fc2a8c4f13d579bf78d7f2667da32.
Change-Id: I8915604faafb21cf15c0f11ee8a770be2cfc9614
Yohann Roussel [Tue, 15 Mar 2016 13:52:46 +0000 (13:52 +0000)]
Merge "Remove one debug line"
Yohann Roussel [Tue, 15 Mar 2016 10:06:51 +0000 (11:06 +0100)]
Remove one debug line
Change-Id: I6de104dd2ca42404d45f3f4b91ccadd03d391f1c
Yohann Roussel [Tue, 15 Mar 2016 09:42:11 +0000 (09:42 +0000)]
Merge "Inform Jack of the min sdk"
Dan Willemsen [Thu, 10 Mar 2016 23:03:41 +0000 (15:03 -0800)]
Always run Soong
Without switching on USE_SOONG, this lets us verify that all builds have
blueprint/soong/go, and can generate a build.ninja file without
producing errors.
Change-Id: I79451ce24c8b5b6745e41d951153265441c33e8a
Shinichiro Hamaji [Mon, 14 Mar 2016 21:59:46 +0000 (21:59 +0000)]
Merge "Use KATI_DEPFILE for .P associated with object files"
Alex Klyubin [Mon, 14 Mar 2016 21:39:56 +0000 (21:39 +0000)]
Merge "Fix two cosmetic issues in signapk."
Alex Klyubin [Mon, 14 Mar 2016 20:33:26 +0000 (13:33 -0700)]
Fix two cosmetic issues in signapk.
* Zip EoCD record comment length was referred to as 32-bit whereas it
is a 16-bit field. The implementation was fine, but the comment and
the naming of a constant were wrong.
* System.out.println was left over from early prototyping days.
Removed.
Bug:
25794543
Change-Id: I97199310d4b4451271a75bb6c6d0463e0b788be9
Dan Willemsen [Mon, 14 Mar 2016 19:35:43 +0000 (19:35 +0000)]
Merge "Handle out being a symlink"
Neil Fuller [Mon, 14 Mar 2016 14:34:05 +0000 (14:34 +0000)]
Merge "Make the language version selection smarter"
Neil Fuller [Fri, 4 Mar 2016 18:00:00 +0000 (18:00 +0000)]
Make the language version selection smarter
Any artifacts that are targeting SDK versions < 24
and not explicitly setting the LOCAL_JAVA_LANGUAGE_VERSION
are now defaulted to 1.7.
Bug:
27495650
Bug:
26753820
Bug:
27377071
(cherry-picked from commit
decb797276462feb4311b04e493da18f942b882f)
Change-Id: I0734b6e690bea32def3dc435c9ce0bd90b845e79
Dan Willemsen [Sat, 12 Mar 2016 00:11:25 +0000 (16:11 -0800)]
Handle out being a symlink
Soong needs to be able to reverse the relative path to out. Switch to
absolute paths if .. won't work because of out being a symlink to
somewhere else.
Bug:
27612837
Change-Id: Ib8b9e0f80523148cfd4b69a03d164578916d8fd5
Yohann Roussel [Wed, 9 Mar 2016 16:19:58 +0000 (17:19 +0100)]
Inform Jack of the min sdk
Set Jack min sdk according to LOCAL_SDK_VERSION. Gives Jack current
version when LOCAL_SDK_VERSION is not available.
Bug:
27371864
Change-Id: Ieba0219494f29d2737d2ca234317c3af7e5e72c8
Sami Tolvanen [Fri, 11 Mar 2016 00:11:25 +0000 (00:11 +0000)]
Merge "Revert "build: pass version and patch level to mkbootimg""
Sami Tolvanen [Fri, 11 Mar 2016 00:08:57 +0000 (00:08 +0000)]
Revert "build: pass version and patch level to mkbootimg"
This reverts commit
8fb47f191f804d21e252ef7bb66886ea087c2d56.
Bug:
27580174
Change-Id: Id87fd1e8da217438757d5a0fa4bbef7aea6770fc
Stephen Hines [Thu, 10 Mar 2016 22:46:01 +0000 (22:46 +0000)]
Merge "Switch to clang-
2658975."
Sen Jiang [Tue, 8 Mar 2016 00:51:01 +0000 (16:51 -0800)]
Add zlib_fingerprint to target_files.zip
Test: make dist
Bug:
27156099
Change-Id: I4608de70ad4dfe6523b832bbf7002dcccefe932f
Dan Willemsen [Thu, 10 Mar 2016 07:22:37 +0000 (07:22 +0000)]
Merge "Use hermetic ckati/makeparallel prebuilts"
Ying Wang [Thu, 10 Mar 2016 02:09:59 +0000 (02:09 +0000)]
Merge "Turn off excess printing during the build which makes errors harder to find."
Joe Onorato [Wed, 9 Mar 2016 22:48:46 +0000 (14:48 -0800)]
Turn off excess printing during the build which makes errors harder to find.
Change-Id: I588de5ddc0aa7dcaacc4ea185c13c2fa3748888a
(cherry-pick from commit
401ffaeb7560fa088d540ed1c150c3f196ebf993)
Dan Willemsen [Tue, 8 Mar 2016 19:12:40 +0000 (11:12 -0800)]
Use hermetic ckati/makeparallel prebuilts
Currently, we're building against the native host version of libc++ and
other headers. Instead, use prebuilts of ckati/makeparallel built with
Soong against the included libc++ and sysroot. Building ckati /
makeparallel doesn't work well in unbundled branches that don't have all
of the libc++ dependencies to do successful host builds.
KATI is default variable defined when running under Kati, don't use it
for other purposes. Use CKATI instead.
Bug:
27533820
Change-Id: I82d66f5e34e3341a3cee4c5c83cd1d9a54d057ff
Todd Kennedy [Wed, 9 Mar 2016 20:54:22 +0000 (20:54 +0000)]
Merge "Define TARGET_OUT_VENDOR_APPS_PRIVILEGED"
Dan Willemsen [Wed, 9 Mar 2016 20:27:57 +0000 (20:27 +0000)]
Merge "OSX: Use the oldest SDK, but always set our target to 10.8"
Dan Willemsen [Tue, 8 Mar 2016 23:20:30 +0000 (15:20 -0800)]
OSX: Use the oldest SDK, but always set our target to 10.8
Build binaries usable on older machines even if older SDKs are not
installed. Older SDKs can no longer be installed on newer Xcode
versions.
Change-Id: I0c9f2534466a127a19107820879c2856bfac0076
Dan Willemsen [Wed, 9 Mar 2016 18:31:17 +0000 (18:31 +0000)]
Merge changes I1fccee8d,Ib343df6d,I2f1984c2
* changes:
Fix C++ on Darwin
Remove support for /Developer
Remove support for Darwin 10.6 SDK
Dan Willemsen [Tue, 8 Mar 2016 23:25:02 +0000 (15:25 -0800)]
Fix C++ on Darwin
We've been including the system libc++ headers even if we're building
against our version of libc++. Stop doing that, and only add the headers
to our path if we're using the system libraries.
If nothing is specified, on recent OSX versions, libc++ is the default
c++ library instead of libstdc++. We've been explicitly including the
libc++ headers on all versions, but that breaks old versions. Force us
over to libc++, since the system libstdc++ does not support C++11, and
libc++ is still supported on our oldest version (10.8).
Change-Id: I1fccee8da0f425e10ccc9d3247ed40664eb6ada0
Tao Bao [Wed, 9 Mar 2016 03:26:19 +0000 (03:26 +0000)]
Merge "Use the update-binary in the source build for downgrade OTAs."
Tao Bao [Wed, 9 Mar 2016 01:53:39 +0000 (17:53 -0800)]
Use the update-binary in the source build for downgrade OTAs.
We used to use the update-binary from the target build when creating
incremental OTAs. But for downgrade OTAs, we should use the one in the
source build instead, which is actually newer.
Bug:
27556903
Change-Id: Ib6415729b979dbffdebdda24902f7f560942801a
Dan Willemsen [Tue, 8 Mar 2016 21:23:23 +0000 (13:23 -0800)]
Remove support for /Developer
/Developer was removed in Xcode 4.3. Our minimum SDK version is 10.8,
which implies at least Xcode 4.4, and our documentation requires
Xcode 4.5.2.
Change-Id: Ib343df6ded6e98222d8ee2e542e1f3fadd2b1397
Dan Willemsen [Tue, 8 Mar 2016 21:22:36 +0000 (13:22 -0800)]
Remove support for Darwin 10.6 SDK
Our minimum version is 10.8
Change-Id: I2f1984c2227861a3c784f2a5070853c2d1b250d6
Sami Tolvanen [Tue, 8 Mar 2016 16:08:14 +0000 (16:08 +0000)]
Merge "build: pass version and patch level to mkbootimg"
am:
b32d845090
* commit '
b32d845090d19d2dfbbf32d4628ef81478325927':
build: pass version and patch level to mkbootimg
Sami Tolvanen [Tue, 8 Mar 2016 16:02:24 +0000 (16:02 +0000)]
Merge "build: pass version and patch level to mkbootimg"
Dan Willemsen [Tue, 8 Mar 2016 00:16:45 +0000 (00:16 +0000)]
Merge "Reexport include dirs for whole static libs"
am:
e2379484ab
* commit '
e2379484ab96e7e5f9a60061557e492068ef1789':
Reexport include dirs for whole static libs
Dan Willemsen [Tue, 8 Mar 2016 00:14:02 +0000 (00:14 +0000)]
Merge "Reexport include dirs for whole static libs"
Martin Blumenstingl [Tue, 8 Mar 2016 00:05:12 +0000 (00:05 +0000)]
Merge "Removed duplicate definition of E2FSCK"
am:
d7a4e56a87
* commit '
d7a4e56a87c324378e60f5989a14a5d5addfd456':
Removed duplicate definition of E2FSCK
Colin Cross [Mon, 7 Mar 2016 23:54:40 +0000 (23:54 +0000)]
Merge "Removed duplicate definition of E2FSCK"
Tao Bao [Mon, 7 Mar 2016 22:35:40 +0000 (22:35 +0000)]
Merge "releasetools: Fix the bug in AssertSequenceGood."
am:
236e664efa
* commit '
236e664efa04bd92ce28ba553afebf8e79ca17fa':
releasetools: Fix the bug in AssertSequenceGood.
Tao Bao [Mon, 7 Mar 2016 22:25:02 +0000 (22:25 +0000)]
Merge "releasetools: Fix the bug in AssertSequenceGood."
Elliott Hughes [Mon, 7 Mar 2016 22:17:37 +0000 (22:17 +0000)]
Merge "Use ulimit -p rather than prlimit."
am:
74d4d98be1
* commit '
74d4d98be1156982a1ab9a26be1dac26ee4e51d1':
Use ulimit -p rather than prlimit.
Elliott Hughes [Mon, 7 Mar 2016 22:10:44 +0000 (22:10 +0000)]
Merge "Use ulimit -p rather than prlimit."
Elliott Hughes [Mon, 7 Mar 2016 21:53:53 +0000 (13:53 -0800)]
Use ulimit -p rather than prlimit.
Neither is standard, but ulimit is toybox and therefore a bit more
regular and at least has help text.
Change-Id: Id7ba9adc9ca256b821d8060506010abef30dee28
Elliott Hughes [Mon, 7 Mar 2016 21:22:53 +0000 (21:22 +0000)]
Merge "Move BUILD_NATIVE_BENCHMARK over to libgoogle-benchmark."
am:
ef0c20621d
* commit '
ef0c20621d7b82f25f8fa669a0b2d8031588169d':
Move BUILD_NATIVE_BENCHMARK over to libgoogle-benchmark.
Elliott Hughes [Mon, 7 Mar 2016 21:17:45 +0000 (21:17 +0000)]
Merge "Move BUILD_NATIVE_BENCHMARK over to libgoogle-benchmark."
Tao Bao [Mon, 7 Mar 2016 21:03:19 +0000 (13:03 -0800)]
releasetools: Support OTAs that have OEM properties changes.
We need to handle a special case that an OTA goes from a source build
without OEM properties to a target build with those properties (or vice
versa). Add support in OTA scripts to deal the case properly, by a)
using two oem_props variables to handle source and target builds
respectively; b) adjusting the fingerprint/thumbprint assertions to
allow a mix of both.
Change-Id: Ib517c366730b967a974c89528df9d42887c92ec2
Ying Wang [Mon, 7 Mar 2016 20:04:13 +0000 (20:04 +0000)]
Merge "Fix dumping variables of absolute paths."
am:
dd70b91060
* commit '
dd70b9106079f39738c129c6f874576748f92d3e':
Fix dumping variables of absolute paths.
Ying Wang [Mon, 7 Mar 2016 19:58:14 +0000 (19:58 +0000)]
Merge "Fix dumping variables of absolute paths."
Sami Tolvanen [Fri, 4 Mar 2016 23:41:02 +0000 (15:41 -0800)]
build: pass version and patch level to mkbootimg
Add --os_version and --os_patch_level arguments to mkbootimg.
Needs matching changes from
I57682611e0c27fec5ed284da7d9a788383ff98b1
Bug:
27498078
Bug:
22914603
Change-Id: I04e20b0de40d864aac92ac7bcf466a6cbde3d0e4
Ying Wang [Mon, 7 Mar 2016 19:27:20 +0000 (11:27 -0800)]
Fix dumping variables of absolute paths.
Calling $(abspath) is better than checking and prepending $(PWD) if
necessary.
Bug:
27429759
Change-Id: Ia156f8a5d6b88b6090f4d23c7f9166bd62d3ab70
Martin Blumenstingl [Sun, 6 Mar 2016 21:38:19 +0000 (22:38 +0100)]
Removed duplicate definition of E2FSCK
Change-Id: I810711ad05e198ee1f9606c37649e80df7b55fa5
Ying Wang [Sat, 5 Mar 2016 00:32:27 +0000 (00:32 +0000)]
Merge "Delete relics left behind by commit
86e6b7ed51dab3e ."
am:
880c9ffe7a
* commit '
880c9ffe7a47c163f986f7bc02963bbde1c83c0f':
Delete relics left behind by commit
86e6b7ed51dab3e .
Ying Wang [Sat, 5 Mar 2016 00:29:00 +0000 (00:29 +0000)]
Merge "Delete relics left behind by commit
86e6b7ed51dab3e ."
Ying Wang [Sat, 5 Mar 2016 00:24:36 +0000 (16:24 -0800)]
Delete relics left behind by commit
86e6b7ed51dab3e .
Change-Id: I81febc28f471727fc37335b11e47749753a57997
(cherry-pick from commit
0f59fdf30db2209cf30ea042d86ef60dcf807838)
Dan Willemsen [Fri, 4 Mar 2016 23:55:48 +0000 (23:55 +0000)]
Merge "Tell soong about MALLOC_SVELTE"
am:
fd2691c35f
* commit '
fd2691c35f6e0c7b5339befa8afefaebdfb72283':
Tell soong about MALLOC_SVELTE
Dan Willemsen [Fri, 4 Mar 2016 23:53:36 +0000 (23:53 +0000)]
Merge "Tell soong about MALLOC_SVELTE"
Tao Bao [Fri, 4 Mar 2016 23:23:34 +0000 (15:23 -0800)]
releasetools: Fix the bug in AssertSequenceGood.
We use a bitset for blocks in the target image to assert a block hasn't
been touched before reading. Skip checking the blocks that are in the
source image only.
Change-Id: I3a77292da673c813bd20d8dc177ff36419d8ecae