OSDN Git Service
Dan Albert [Fri, 11 Sep 2015 22:14:30 +0000 (22:14 +0000)]
am
da196abf: Merge "Fix `LOCAL_CXX_STL := none` for Windows."
* commit '
da196abf10fd9a500fe223952d96cf93ed699983':
Fix `LOCAL_CXX_STL := none` for Windows.
Dan Albert [Fri, 11 Sep 2015 20:44:46 +0000 (20:44 +0000)]
Merge "Fix `LOCAL_CXX_STL := none` for Windows."
Dan Albert [Fri, 11 Sep 2015 17:57:14 +0000 (10:57 -0700)]
Fix `LOCAL_CXX_STL := none` for Windows.
We still need to link the various MSVC libraries even if we aren't
using the STL.
Bug: http://b/
22953515
Change-Id: I73c35710a6162408e99480a4840eedd291adf7ab
Shinichiro Hamaji [Thu, 10 Sep 2015 03:37:24 +0000 (03:37 +0000)]
am
6d20af03: Merge "Use the same build.ninja for normal make targets"
* commit '
6d20af0391569a2f7b70a6816ddaf316b15e5a70':
Use the same build.ninja for normal make targets
Shinichiro Hamaji [Thu, 10 Sep 2015 03:31:59 +0000 (03:31 +0000)]
Merge "Use the same build.ninja for normal make targets"
Dan Willemsen [Thu, 10 Sep 2015 00:53:08 +0000 (00:53 +0000)]
am
96d3c0d0: Merge "Update the build system doc"
* commit '
96d3c0d0b14e94583438d9e93f011b1b0c930e38':
Update the build system doc
Dan Willemsen [Thu, 10 Sep 2015 00:45:59 +0000 (00:45 +0000)]
Merge "Update the build system doc"
Dan Willemsen [Wed, 9 Sep 2015 23:51:09 +0000 (16:51 -0700)]
Update the build system doc
This adds a reference to the _{32|64|arm|arm64|...|darwin|linux|windows}
variables, and adds information about how LOCAL_MODULE_HOST_OS works.
It also removes many (but not all) obsolete references.
Bug:
23566667
Change-Id: Ief16a5e245eb65ac00fc23d4fc1b7a409a7a64bd
Dan Willemsen [Wed, 9 Sep 2015 23:25:11 +0000 (23:25 +0000)]
am
c8db47a0: Merge "Don\'t build windows modules with clang, fix flags"
* commit '
c8db47a0213aa5c204c140cb9268389b4175ae06':
Don't build windows modules with clang, fix flags
Dan Willemsen [Wed, 9 Sep 2015 23:17:47 +0000 (23:17 +0000)]
Merge "Don't build windows modules with clang, fix flags"
Dan Willemsen [Wed, 9 Sep 2015 22:45:21 +0000 (15:45 -0700)]
Don't build windows modules with clang, fix flags
shamu checkbuilds set USE_CLANG_PLATFORM_BUILD, which shouldn't apply to
modules built for windows. Also fix some flags that were being set
improperly.
Bug:
23566667
Change-Id: Id4c5b7cc59966328483d90f2b7be3f35e439ecee
Tao Bao [Wed, 9 Sep 2015 19:39:40 +0000 (19:39 +0000)]
am
c5fe3f11: Merge "releasetools: Fix the expected total blocks."
* commit '
c5fe3f117d79ed9ddb6e77fbf211a87dc5dffed4':
releasetools: Fix the expected total blocks.
Tao Bao [Wed, 9 Sep 2015 19:29:59 +0000 (19:29 +0000)]
Merge "releasetools: Fix the expected total blocks."
Tao Bao [Wed, 9 Sep 2015 18:55:01 +0000 (11:55 -0700)]
releasetools: Fix the expected total blocks.
With the change in [1], it zeroes out extra blocks that might be read
by dm-verity. We should update the expected number of blocks that get
touched.
[1] commit
e9b619108dbe0c358ba6c14e27c92a623a7c1059.
Bug:
23786644
Change-Id: I7a7c3531e5af6bf381d3a14832e77abfa9a8efce
Dan Willemsen [Wed, 9 Sep 2015 18:19:13 +0000 (18:19 +0000)]
am
f1c09d7f: Merge "Add HOST_CROSS_OS"
* commit '
f1c09d7fbd92a08cc51950a7d35fb5f7fc564a20':
Add HOST_CROSS_OS
Dan Albert [Wed, 9 Sep 2015 18:19:11 +0000 (18:19 +0000)]
am
feb3ecaf: Merge "Fix name for NDK protobuf libraries."
* commit '
feb3ecaff02d2bddb82aae0fa3024d9b9a62169e':
Fix name for NDK protobuf libraries.
Dan Willemsen [Wed, 9 Sep 2015 18:13:21 +0000 (18:13 +0000)]
Merge "Add HOST_CROSS_OS"
Dan Albert [Wed, 9 Sep 2015 18:13:16 +0000 (18:13 +0000)]
Merge "Fix name for NDK protobuf libraries."
Dan Willemsen [Fri, 14 Aug 2015 19:59:50 +0000 (12:59 -0700)]
Add HOST_CROSS_OS
Instead of using recursive make to change the HOST_OS when building the
windows SDK under linux, add the concept of cross-building to another
host os.
Bug:
23566667
Change-Id: I6dc525b601b6251d458d197c30bf4660d7485502
Shinichiro Hamaji [Fri, 4 Sep 2015 05:38:37 +0000 (14:38 +0900)]
Use the same build.ninja for normal make targets
$(PARSE_TIME_MAKE_GOALS) is a list of known goals which affect
parsing of make (e.g., there is $(filter XXX,$(MAKECMDGOALS))).
If the make targets contain one of them, we keep using a
different build.ninja for each combination of make targets.
Otherwise, we use the same build.ninja which has all phony
targets.
Also load vendor/google/build/ninja_config.mk so it can add
Google-specific goals to $(PARSE_TIME_MAKE_GOALS).
Bug:
23685536
Change-Id: I3da5c76fa7644a05a55c374a754212f4fb794818
Tao Bao [Tue, 8 Sep 2015 22:33:16 +0000 (22:33 +0000)]
am
10b2e62b: Merge "releasetools: Don\'t write empty groups."
* commit '
10b2e62b6d45dc4b406be1544fd9b25d6f800e89':
releasetools: Don't write empty groups.
Tao Bao [Tue, 8 Sep 2015 22:25:42 +0000 (22:25 +0000)]
Merge "releasetools: Don't write empty groups."
Tao Bao [Tue, 8 Sep 2015 20:39:40 +0000 (13:39 -0700)]
releasetools: Don't write empty groups.
For a DataImage, we may have no mapping of ZERO or NONZERO blocks. Don't
write those groups if they are empty.
Bug:
19024504
Change-Id: I1e921effcdbf0661d4f4b541c104dd456ac0c582
Tao Bao [Tue, 8 Sep 2015 17:50:25 +0000 (17:50 +0000)]
am
16656668: Merge "releasetools: Always write the last block if it\'s padded."
* commit '
16656668e1cca5b62ca4487206c462b93bf5a0fc':
releasetools: Always write the last block if it's padded.
Dan Albert [Tue, 8 Sep 2015 17:47:03 +0000 (10:47 -0700)]
Fix name for NDK protobuf libraries.
Name them *-ndk so it's clear which library is which.
Change-Id: I53544a8a97488f902e00d1aedaa021d09ee2f649
Tao Bao [Tue, 8 Sep 2015 17:41:47 +0000 (17:41 +0000)]
Merge "releasetools: Always write the last block if it's padded."
Shinichiro Hamaji [Mon, 7 Sep 2015 05:44:30 +0000 (05:44 +0000)]
am
e711afb1: Merge "Use as a part of ninja suffix"
* commit '
e711afb154333407fe42e8ffe36bf76448d4f80f':
Use $(BUILD_MODULES_IN_PATHS) as a part of ninja suffix
Shinichiro Hamaji [Mon, 7 Sep 2015 05:38:24 +0000 (05:38 +0000)]
Merge "Use $(BUILD_MODULES_IN_PATHS) as a part of ninja suffix"
Tao Bao [Sun, 6 Sep 2015 03:35:32 +0000 (20:35 -0700)]
releasetools: Always write the last block if it's padded.
In BBOTAs if the last block of a DataImage is padded, we should always
write the whole block even for incremental OTAs. Because otherwise the
last block may be skipped if unchanged, but would fail the post-install
verification if it has non-zero contents in the padding bytes.
Bug:
23828506
Change-Id: I4b0af7344d18261258cd48d18c029c089d6ff365
Dan Willemsen [Sat, 5 Sep 2015 01:29:56 +0000 (01:29 +0000)]
am
76274670: Merge "Fix LOCAL_MODULE_HOST_OS"
* commit '
762746705c7414985dbd457481dd33d4c69adcbb':
Fix LOCAL_MODULE_HOST_OS
Dan Willemsen [Sat, 5 Sep 2015 01:25:16 +0000 (01:25 +0000)]
Merge "Fix LOCAL_MODULE_HOST_OS"
Shinichiro Hamaji [Fri, 4 Sep 2015 02:41:33 +0000 (11:41 +0900)]
Use $(BUILD_MODULES_IN_PATHS) as a part of ninja suffix
So that switching between two different mmma targets won't
need regenerating ninja files.
Change-Id: Ifddd75ec49abd3ab2a54c6afbb902b0b32359db8
Dan Willemsen [Fri, 4 Sep 2015 22:08:08 +0000 (15:08 -0700)]
Fix LOCAL_MODULE_HOST_OS
Make sure LOCAL_IS_HOST_MODULE is set before including
module_arch_supported.mk
Bug:
23566667
Change-Id: I28ef10f093407eb3a6a83574ecc3f098eb775241
Ying Wang [Fri, 4 Sep 2015 17:56:24 +0000 (17:56 +0000)]
am
af72e1b3: Merge "Move part of logtags stuff back to base_rules.mk."
* commit '
af72e1b3e68f449c81054bc25e655016529914e1':
Move part of logtags stuff back to base_rules.mk.
Tao Bao [Fri, 4 Sep 2015 17:56:22 +0000 (17:56 +0000)]
am
8f4b307e: Merge "releasetools: Fix the bug when deleting files."
* commit '
8f4b307e56ea73153f249b44dc2b15de77e058f7':
releasetools: Fix the bug when deleting files.
Ying Wang [Fri, 4 Sep 2015 17:31:07 +0000 (17:31 +0000)]
Merge "Move part of logtags stuff back to base_rules.mk."
Tao Bao [Fri, 4 Sep 2015 17:05:55 +0000 (17:05 +0000)]
Merge "releasetools: Fix the bug when deleting files."
Yasuhiro Matsuda [Fri, 4 Sep 2015 07:23:49 +0000 (16:23 +0900)]
Move part of logtags stuff back to base_rules.mk.
Otherwise event tags for non-Java modules
(e.g. logcat, libsurfaceflinger) are not generated.
BUG:
23803975
Change-Id: I6fd53fe2ca39102787fc513aa8c23f906b94f253
Tao Bao [Fri, 4 Sep 2015 04:17:37 +0000 (21:17 -0700)]
releasetools: Fix the bug when deleting files.
For file-based OTAs, we used to remove unneeded files in ascending
order, which failed to delete non-empty directories. Reverse the order
to fix the issue.
For example, now we have the following in our generated script:
delete("/system/app/Calculator/arm/Calculator.odex",
"/system/app/Calculator/arm/",
"/system/app/Calculator/Calculator.apk",
"/system/app/Calculator/");
Bug:
22960996
Change-Id: I0d36d29b7862fb53bf55bf5685a990180f9c0b3b
Dan Willemsen [Fri, 4 Sep 2015 01:31:22 +0000 (01:31 +0000)]
am
4379e2b8: Merge "Add LOCAL_MODULE_HOST_OS"
* commit '
4379e2b8bbaf2a02777f189c758e251015eb7f76':
Add LOCAL_MODULE_HOST_OS
Dan Willemsen [Fri, 4 Sep 2015 01:24:15 +0000 (01:24 +0000)]
Merge "Add LOCAL_MODULE_HOST_OS"
Dan Willemsen [Fri, 14 Aug 2015 19:59:06 +0000 (12:59 -0700)]
Add LOCAL_MODULE_HOST_OS
Instead of wrapping a host module definition in 'ifeq($(HOST_OS),...)'
in the Android.mk files, define which hosts are supported using
LOCAL_MODULE_HOST_OS.
A blank LOCAL_MODULE_HOST_OS means that linux and darwin are supported.
A non-empty LOCAL_MODULE_HOST_OS lists the supported HOST_OSs.
Change-Id: I1e342d1908cfa00aef2c39c145b4f5f81c373bc6
Tom Cherry [Thu, 3 Sep 2015 22:02:38 +0000 (22:02 +0000)]
am
62062c9d: Merge "move init.trace.rc to frameworks/native"
* commit '
62062c9d66e38ad404d93e963c1341fa4b7090fe':
move init.trace.rc to frameworks/native
Tom Cherry [Thu, 3 Sep 2015 21:52:45 +0000 (21:52 +0000)]
Merge "move init.trace.rc to frameworks/native"
Tom Cherry [Thu, 3 Sep 2015 21:12:48 +0000 (14:12 -0700)]
move init.trace.rc to frameworks/native
init.trace.rc will be renamed to atrace.rc and use the LOCAL_INIT_RC
mechanism to be included on /system appropriately.
Bug
23186545
Change-Id: Ibb86761d3e8d3c6d194ddb1220f93a71a8c6675b
Tao Bao [Thu, 3 Sep 2015 01:40:41 +0000 (01:40 +0000)]
am
c6c9c61d: Merge "releasetools: Fix the bug in symlink deletion."
* commit '
c6c9c61d05ffcc41239baaa1f3011b17e8518b65':
releasetools: Fix the bug in symlink deletion.
Tao Bao [Thu, 3 Sep 2015 01:32:08 +0000 (01:32 +0000)]
Merge "releasetools: Fix the bug in symlink deletion."
Tao Bao [Wed, 2 Sep 2015 17:28:08 +0000 (10:28 -0700)]
releasetools: Fix the bug in symlink deletion.
For file-based OTAs, symlinks in the source build but not in the target
build will be deleted. However, if a symlink is replaced by a regular
file in the target build, the file will be accidentally deleted when
applying (resuming) the same package again.
Verify the checksum of a symlink that will be unpacked or renamed to.
Delete the file only if it doesn't have the target checksum.
Bug:
23646151
Change-Id: Ie322abb6022b6fa812c6b36a3127872d9614fc3b
Ying Wang [Wed, 2 Sep 2015 21:18:38 +0000 (21:18 +0000)]
am
4e2f1903: Merge "Clean up Javac a little bit."
* commit '
4e2f190315759b4270ab414b9ff1e24a19521521':
Clean up Javac a little bit.
Ying Wang [Wed, 2 Sep 2015 20:48:50 +0000 (20:48 +0000)]
Merge "Clean up Javac a little bit."
Evgenii Stepanov [Wed, 2 Sep 2015 20:18:12 +0000 (20:18 +0000)]
am
617770c1: Merge "Add AddressSanitizer linker flags for x86."
* commit '
617770c133330fc06070e97ce39bbf065c749c97':
Add AddressSanitizer linker flags for x86.
Evgenii Stepanov [Wed, 2 Sep 2015 20:13:37 +0000 (20:13 +0000)]
Merge "Add AddressSanitizer linker flags for x86."
Ivan Krasin [Wed, 2 Sep 2015 18:56:40 +0000 (11:56 -0700)]
Add AddressSanitizer linker flags for x86.
This is the 1/4 change required to get AddressSanitizer
for Android x86 to work.
Change-Id: I848805af34fdd32a313c991504d6014f9b97ab88
Ying Wang [Wed, 2 Sep 2015 02:12:05 +0000 (19:12 -0700)]
Clean up Javac a little bit.
- Added GLOBAL_JAVAC_DEBUG_FLAGS and merge it to
PRIVATE_JAVACFLAGS/PRIVATE_JACK_FLAGS to get rid of
PRIVATE_JAVAC_DEBUG_FLAGS/PRIVATE_JACK_DEBUG_FLAGS.
- With Java rules out of base_rules.mk we can get rid
of java_alternative_checked_module now.
Change-Id: I1a14716c785e3d49330a75044107662ce96a9307
Shinichiro Hamaji [Wed, 2 Sep 2015 00:04:45 +0000 (00:04 +0000)]
am
e1b9123d: Merge "Set --ninja_suffix based on make/mm/mmm targets"
* commit '
e1b9123d51f20543fd13ebd611c9c2fe92ecaf9c':
Set --ninja_suffix based on make/mm/mmm targets
Shinichiro Hamaji [Tue, 1 Sep 2015 23:53:41 +0000 (23:53 +0000)]
Merge "Set --ninja_suffix based on make/mm/mmm targets"
Shinichiro Hamaji [Tue, 1 Sep 2015 05:24:18 +0000 (14:24 +0900)]
Set --ninja_suffix based on make/mm/mmm targets
This fixes two issues:
- Switching make target didn't work well when the latter
make target is not a subset of the first make target.
- Switching between m and mm/mmm forced build.ninja to be
regenerated.
Bug:
23685536
Change-Id: I3c3550d6cca3007d166a13367d6bc22cc3feede2
Shinichiro Hamaji [Tue, 1 Sep 2015 16:37:44 +0000 (16:37 +0000)]
am
ec8f9731: Merge "Show error message when resource limit too low for USE_GOMA=true"
* commit '
ec8f973147c3eacb048dd486c9534562f0328303':
Show error message when resource limit too low for USE_GOMA=true
Dan Willemsen [Tue, 1 Sep 2015 16:37:42 +0000 (16:37 +0000)]
am
d0ae4796: Merge "Blacklist libc++ from windows host builds"
* commit '
d0ae4796a10b9855a738c5f5c79e603cac30cb9f':
Blacklist libc++ from windows host builds
Richard Uhler [Tue, 1 Sep 2015 16:36:23 +0000 (16:36 +0000)]
am
e4c753f4: Merge "Add ahat to runtime_libart product."
* commit '
e4c753f428ff404f10ec1bf170ea18ed2687dc07':
Add ahat to runtime_libart product.
Ying Wang [Tue, 1 Sep 2015 16:35:59 +0000 (16:35 +0000)]
am
8838c72e: Merge "Cleaned the outdated incrementaljavac."
* commit '
8838c72e8a339270fb3bea3d467200c6c0c28782':
Cleaned the outdated incrementaljavac.
Ying Wang [Tue, 1 Sep 2015 16:31:56 +0000 (09:31 -0700)]
resolved conflicts for merge of
a15ae216 to stage-aosp-master
Change-Id: I9c10cf2d10f4295d12edd490ff0f9482c1810bf8
Shinichiro Hamaji [Tue, 1 Sep 2015 02:26:15 +0000 (02:26 +0000)]
Merge "Show error message when resource limit too low for USE_GOMA=true"
Dan Willemsen [Tue, 1 Sep 2015 00:44:21 +0000 (00:44 +0000)]
Merge "Blacklist libc++ from windows host builds"
Richard Uhler [Mon, 31 Aug 2015 16:53:55 +0000 (16:53 +0000)]
Merge "Add ahat to runtime_libart product."
Ying Wang [Sat, 29 Aug 2015 18:09:20 +0000 (18:09 +0000)]
Merge "Cleaned the outdated incrementaljavac."
Ying Wang [Fri, 8 May 2015 20:27:25 +0000 (13:27 -0700)]
Cleaned the outdated incrementaljavac.
Nobody is using this feature and now we switched to jack.
Change-Id: I749b486eb347cbf3ee7b107565fc800eeb238c44
(cherry-picked from commit
90598cb70c3a6e65223f02c4104e823024caf693)
Ying Wang [Sat, 29 Aug 2015 16:40:30 +0000 (16:40 +0000)]
Merge "Move Java stuff out of base_rules.mk"
Shinichiro Hamaji [Sat, 29 Aug 2015 02:58:47 +0000 (11:58 +0900)]
Show error message when resource limit too low for USE_GOMA=true
This should be particularly helpful for Mac users, because the
default limits of Mac are too low.
Change-Id: I03f0f76a0707b4ce5ef9cddf5df6e3857a215996
Ying Wang [Fri, 28 Aug 2015 18:47:03 +0000 (11:47 -0700)]
Move Java stuff out of base_rules.mk
- Moved the target-only .aidl and .logtag rules to java.mk.
- Moved the .proto rules, Java library dependency calculation,
Java resource processing and Java-related
target-specific and global variables setup to a new java_common.java,
which is shared by both target and host Java modules.
- Minor cleanup for the moved code.
Bug:
23597357
Change-Id: Ic3eb72e26bb1a663e5739abe0a935f96b88bc352
Richard Uhler [Fri, 31 Jul 2015 16:39:26 +0000 (09:39 -0700)]
Add ahat to runtime_libart product.
Change-Id: Iae5837f884c926a9f0e57df56bd21b6260ee8b2d
Elliott Hughes [Fri, 28 Aug 2015 19:59:18 +0000 (19:59 +0000)]
am
4548e7f4: Merge "Remove AndroidConfig.h."
* commit '
4548e7f49dbec05c8b8187b0ea9e746fc47ec5d3':
Remove AndroidConfig.h.
Elliott Hughes [Fri, 28 Aug 2015 19:47:36 +0000 (19:47 +0000)]
Merge "Remove AndroidConfig.h."
Tao Bao [Fri, 28 Aug 2015 18:46:31 +0000 (18:46 +0000)]
am
35da9685: Merge "Use the basename of file_contexts from the info dict."
* commit '
35da9685f0d3bb367b50aaa4c476b12907099f77':
Use the basename of file_contexts from the info dict.
Tao Bao [Fri, 28 Aug 2015 18:33:25 +0000 (18:33 +0000)]
Merge "Use the basename of file_contexts from the info dict."
Tao Bao [Fri, 28 Aug 2015 17:52:03 +0000 (10:52 -0700)]
Use the basename of file_contexts from the info dict.
Changes in [1] break the backward compatibility of the OTA scripts. Fix
the issue by extracting the file basename from the info dict in
META/misc_info.txt.
[1] commit
d3a803e6680e86f7b4960d51ab0b620728b793ca
Bug:
23620049
Change-Id: I40a5625bbe0beb295f34b2328906a4a4283fe59b
Elliott Hughes [Fri, 28 Aug 2015 17:31:28 +0000 (10:31 -0700)]
Remove AndroidConfig.h.
This change leaves soong references.
Change-Id: Iee32b6b97ad9711f69e999c9d01f01d71562b63f
Dan Willemsen [Fri, 28 Aug 2015 03:49:02 +0000 (03:49 +0000)]
am
57ff23b0: Merge "Add support for LOCAL_SRC_FILES_(host)_(arch)"
* commit '
57ff23b0ed02affce494d14d8a0f5e9e4717baf7':
Add support for LOCAL_SRC_FILES_(host)_(arch)
Dan Willemsen [Fri, 28 Aug 2015 03:49:01 +0000 (03:49 +0000)]
am
d5deac8d: Merge "Add _(darwin|linux|windows)"
* commit '
d5deac8db951ec0a1c9edd806ea1758b836f8c46':
Add _(darwin|linux|windows)
Dan Willemsen [Fri, 28 Aug 2015 03:39:34 +0000 (03:39 +0000)]
Merge "Add support for LOCAL_SRC_FILES_(host)_(arch)"
Dan Willemsen [Wed, 19 Aug 2015 00:47:06 +0000 (17:47 -0700)]
Add support for LOCAL_SRC_FILES_(host)_(arch)
For boringssl, which has architecture specific host assembly files
Bug:
23566667
Change-Id: Ia4602d28e93a1b3d1400cf95417b5e446c5fb84b
Dan Willemsen [Fri, 28 Aug 2015 03:37:30 +0000 (03:37 +0000)]
Merge "Add _(darwin|linux|windows)"
Dan Willemsen [Fri, 14 Aug 2015 00:51:40 +0000 (17:51 -0700)]
Add _(darwin|linux|windows)
So that we can support building both linux and windows binaries at the
same time on a linux host. This replaces the ifeq($(HOST_OS),...) checks
in Android.mk files.
Bug:
23566667
Change-Id: I693e11984e36d55bb6f09fa0d49bc485463e16fb
Bill Yi [Thu, 27 Aug 2015 22:09:29 +0000 (15:09 -0700)]
Tao Bao [Thu, 27 Aug 2015 20:44:35 +0000 (20:44 +0000)]
am
6458fd96: Merge "rangelib.py: Fix the bug in monotonic check."
* commit '
6458fd96d5d0cd3b54a02a5f9c276f49e566cb53':
rangelib.py: Fix the bug in monotonic check.
Tao Bao [Thu, 27 Aug 2015 19:16:06 +0000 (19:16 +0000)]
Merge "rangelib.py: Fix the bug in monotonic check."
Tao Bao [Thu, 27 Aug 2015 05:23:08 +0000 (05:23 +0000)]
am
14342066: Merge "Add unit tests for rangelib.py."
* commit '
14342066dbaec25593c12fdba5396d4ca9cad841':
Add unit tests for rangelib.py.
Tao Bao [Thu, 27 Aug 2015 00:07:14 +0000 (17:07 -0700)]
rangelib.py: Fix the bug in monotonic check.
RangeSet("2-10").monotonic gives a wrong result of "False". Fix the bug
and add more tests into test_rangelib.py.
Change-Id: I04780571b45ecafd34040f405756b9745a9e21a5
Ying Wang [Thu, 27 Aug 2015 01:38:15 +0000 (01:38 +0000)]
am
4fc14679: am
fc168f84: resolved conflicts for merge of
1a8c6567 to lmp-mr1-ub-dev
* commit '
4fc1467949aaf9e6a49a6771ed996e3c2c702314':
Don't fail build of otatools if there are no device certificates
Ying Wang [Thu, 27 Aug 2015 01:38:14 +0000 (01:38 +0000)]
am
8f7c08ed: am
1e120181: am
473b6a5f: am
fc028e59: Dist the otatools package.
* commit '
8f7c08ed622d733c0997324d5b0464ba7e57c1fa':
Dist the otatools package.
Ying Wang [Thu, 27 Aug 2015 01:33:15 +0000 (01:33 +0000)]
am
fc168f84: resolved conflicts for merge of
1a8c6567 to lmp-mr1-ub-dev
* commit '
fc168f84695f492f2ad0eed3063145f425bebf45':
Don't fail build of otatools if there are no device certificates
Ying Wang [Thu, 27 Aug 2015 01:27:37 +0000 (01:27 +0000)]
am
1e120181: am
473b6a5f: am
fc028e59: Dist the otatools package.
* commit '
1e120181f0a9240eca61dface4fb4530bf2594ab':
Dist the otatools package.
Ying Wang [Thu, 27 Aug 2015 00:03:18 +0000 (17:03 -0700)]
resolved conflicts for merge of
1a8c6567 to lmp-mr1-ub-dev
Change-Id: Iadb7c55c246705ac10c6822b7bb5d71794ce485b
Tao Bao [Wed, 26 Aug 2015 23:26:54 +0000 (23:26 +0000)]
Merge "Add unit tests for rangelib.py."
Tao Bao [Wed, 26 Aug 2015 23:13:18 +0000 (16:13 -0700)]
Add unit tests for rangelib.py.
Separate the test cases in rangelib.py comments into a python unittest
file.
To invoke:
$ python -m unittest test_rangelib
Change-Id: I59e4ce0aaccc83bcbb42fee15775683dcd559d99
Ying Wang [Wed, 26 Aug 2015 20:17:16 +0000 (20:17 +0000)]
am
473b6a5f: am
fc028e59: Dist the otatools package.
* commit '
473b6a5f2b00f941acb08b5c3df59cbbdf647609':
Dist the otatools package.
Tao Bao [Wed, 26 Aug 2015 19:55:20 +0000 (19:55 +0000)]
am
68319cdf: am
95708eea: Merge "Split large files for BBOTA v3."
* commit '
68319cdf4762c7c48cff68ede2b7f4bc267db735':
Split large files for BBOTA v3.
Tao Bao [Wed, 26 Aug 2015 19:46:39 +0000 (19:46 +0000)]
am
95708eea: Merge "Split large files for BBOTA v3."
* commit '
95708eea4e50e9048bad13d129aa2f818b808ea8':
Split large files for BBOTA v3.
Tao Bao [Wed, 26 Aug 2015 19:39:31 +0000 (19:39 +0000)]
Merge "Split large files for BBOTA v3."
Tao Bao [Tue, 25 Aug 2015 22:10:10 +0000 (15:10 -0700)]
Split large files for BBOTA v3.
For BBOTA v3, we need to stash source blocks to support resumable
feature. However, with the growth of file size and the shrink of the
cache size, source blocks that represent a file are too large to be
stashed as a whole. CL in [1] solves the issue by replacing the diff
command with a "new" command. However, it may increase the generated
package size substantially (e.g. from ~100MB to ~400MB).
With this CL, if a file spans too many blocks, we split it into smaller
pieces by generating multiple commands. For the same case above, it
reduces the package size to ~150MB.
One potential downside is that after splitting, files like .jar,
.apk and .zip can no longer use imgdiff. We may lose the potential
benefit of using imgdiff for patch size reduction.
[1] commit
82c47981bd0602a1c7b50dfabf9a6a2412993bae
Bug:
22430577
Change-Id: I5684fab0ac41c8d94fe18f52a34cef77e06f741c