Commit Graph

42239 Commits

Author SHA1 Message Date
Tao Bao 7eb7637f6b Merge "releasetools: Clean up sign_target_files_apks.py." am: 7d100ce03b am: 336f2cce7d
am: 2b8f63693e

Change-Id: Iad866e0a5dd3ab2257f19fab3511ecda88de3285
2018-01-02 20:09:58 +00:00
Tao Bao 192101a6e8 Merge "releasetools: Fix a bug in blockimgdiff.HeapItem." am: a5e3a258fd am: 442be8f1e5
am: 3859f0d09f

Change-Id: I9dcb7c9d444512c27324e932093b5036c9c57311
2018-01-02 20:05:57 +00:00
Tao Bao 2b8f63693e Merge "releasetools: Clean up sign_target_files_apks.py." am: 7d100ce03b
am: 336f2cce7d

Change-Id: Idb8b486616222a809e34d61d721e8f3f2a6d41ae
2018-01-02 20:05:56 +00:00
Tao Bao 3859f0d09f Merge "releasetools: Fix a bug in blockimgdiff.HeapItem." am: a5e3a258fd
am: 442be8f1e5

Change-Id: I81040b7cb4acbd4ea791a0eb9b251b8d39cabfe3
2018-01-02 20:02:22 +00:00
Tao Bao 336f2cce7d Merge "releasetools: Clean up sign_target_files_apks.py."
am: 7d100ce03b

Change-Id: Iaf34dbeadd8352231592edb518101851ac959c63
2018-01-02 20:02:15 +00:00
Tao Bao 442be8f1e5 Merge "releasetools: Fix a bug in blockimgdiff.HeapItem."
am: a5e3a258fd

Change-Id: I38d4611c51ec511169c727dbfcbe6c2243fcab62
2018-01-02 19:58:58 +00:00
Treehugger Robot 7d100ce03b Merge "releasetools: Clean up sign_target_files_apks.py." 2018-01-02 19:56:03 +00:00
Treehugger Robot a5e3a258fd Merge "releasetools: Fix a bug in blockimgdiff.HeapItem." 2018-01-02 19:52:09 +00:00
Tao Bao 0c28d2d02d releasetools: Clean up sign_target_files_apks.py.
Mostly cosmetic changes, such as replacing print statement with print
function. Also change 'import cStringIO' to optionally look for the one
in io module, to allow Python 2/3 compatibility.

Test: pylint --rcfile=pylintrc sign_target_files_apks.py
Test: Run sign_target_files_apks.py on marlin target_files.zip.
Change-Id: I4dc98b01da6f89e624114bbca5522f659901c1f2
2018-01-02 09:57:29 -08:00
Tao Bao 186ec99eb9 releasetools: Fix a bug in blockimgdiff.HeapItem.
HeapItem defines __bool__(), which contains a logical error that should
return the opposite value.

Note that the bug only manifests while using Python 3, which calls
__bool__(). With Python 2, `if x:` or bool(x) actually calls
x.__nonzero__() or x.__len__(). If a class defines neither __len__() nor
__nonzero__(), as the case in HeapItem, it always returns True.

Test: python -m unittest test_blockimgdiff
Test: python3 -m unittest test_blockimgdiff
Test: Generate an incremental non-A/B OTA package successfully.
Change-Id: Ibe8430e0b495a7d2f430cfffb716d2536ffb53d2
2018-01-02 09:54:32 -08:00
Tobias Thierer 033f848ac4 Merge "Build with OpenJDK 9 -target 1.8 by default (attempt 3)." 2018-01-02 14:07:11 +00:00
Dan Shi 6d4309ac39 Merge "Force test config to be updated when auto_gen_test_config.py is changed" am: a52691b12a am: a05d8cd880
am: 2e0978d48b

Change-Id: I8f89f1d2537a4d7ff92704077765d811f80f98b0
2018-01-02 06:42:54 +00:00
Dan Shi 2e0978d48b Merge "Force test config to be updated when auto_gen_test_config.py is changed" am: a52691b12a
am: a05d8cd880

Change-Id: Ifd6b8d972549ff4e97c031705d09cdc49d55f742
2018-01-02 06:39:16 +00:00
Dan Shi a05d8cd880 Merge "Force test config to be updated when auto_gen_test_config.py is changed"
am: a52691b12a

Change-Id: Ib969a5f9f3cf0ea02843b2265db845b702a8da19
2018-01-02 06:35:56 +00:00
Treehugger Robot a52691b12a Merge "Force test config to be updated when auto_gen_test_config.py is changed" 2018-01-02 06:27:35 +00:00
Dan Shi 2b334f5c92 Force test config to be updated when auto_gen_test_config.py is changed
Bug: 70981774,69929803
Test: Modify tools/auto_gen_test_config.py, confirm the test config file
is updated.

Change-Id: I55bd07c8bdc6e26f9c8ad6df733d2c5da09d0ceb
2018-01-01 20:26:27 -08:00
Zach Riggle 80b7659db7 Merge "Add support for honggfuzz to BUILD_FUZZ_TEST" 2017-12-28 19:07:36 +00:00
Colin Cross 127e7e43d0 Merge changes I84a59a8c,Id7a92fb2 am: 9c2b798143 am: b2b378e007
am: c819a3008a

Change-Id: Ied52a144b5d3ff07b6f0a5a26e5407794dd0cffb
2017-12-28 17:35:09 +00:00
Colin Cross c819a3008a Merge changes I84a59a8c,Id7a92fb2 am: 9c2b798143
am: b2b378e007

Change-Id: I3e4dacf27fcde94e51d2320d4ba8479c313dcedb
2017-12-28 17:32:06 +00:00
Colin Cross b2b378e007 Merge changes I84a59a8c,Id7a92fb2
am: 9c2b798143

Change-Id: Ic613f0a63643346645654cedd233844b8ef9bfb8
2017-12-28 17:29:10 +00:00
Colin Cross 9c2b798143 Merge changes I84a59a8c,Id7a92fb2
* changes:
  Remove obsolete proguard options
  Export proguard flags from static android libraries and aar prebuilts
2017-12-28 17:22:51 +00:00
Colin Cross e4936e1c2d Remove obsolete proguard options
LOCAL_PROGUARD_ENABLED := shrinktests is never set.
proguard_tests.flags is entirely comments.
proguard.emma.flags only references emma classes, but we use
jacoco now.

Test: m checkbuild
Change-Id: I84a59a8c1b66f75d7ccbaa7da8e937430b4490c8
2017-12-28 17:22:30 +00:00
Dan Willemsen 1d64623105 Export proguard flags from static android libraries and aar prebuilts
Test: m Contacts, classes-proguard.jar has same contents
Test: rm -rf out; tapas Contacts; m
Change-Id: Id7a92fb2c44913bccbfcbeae127355b4de588e4d
Merged-In: Id7a92fb2c44913bccbfcbeae127355b4de588e4d
(cherry picked from commit 1417c177ac)
2017-12-28 17:22:19 +00:00
Dan Willemsen 4bcf33404c Merge "Switch some deprecated variables to obsolete" am: 5b82359f85 am: 48a7133006
am: 5a30746f01

Change-Id: If04480f840f489c3de2dda5d19db14aba5aed918
2017-12-28 04:42:57 +00:00
Dan Willemsen 5a30746f01 Merge "Switch some deprecated variables to obsolete" am: 5b82359f85
am: 48a7133006

Change-Id: I85466810f07061ab927b06dd41d54d8e9c9b2bfe
2017-12-28 04:39:16 +00:00
Dan Willemsen 48a7133006 Merge "Switch some deprecated variables to obsolete"
am: 5b82359f85

Change-Id: Ieb0458ec51418a12aca920285f440540a3cbf24a
2017-12-28 04:36:11 +00:00
Dan Willemsen 5b82359f85 Merge "Switch some deprecated variables to obsolete" 2017-12-28 04:28:48 +00:00
Dan Willemsen 74afb1d993 Switch some deprecated variables to obsolete
These are no longer used.

Test: check build_test logs for "has been deprecated"
Change-Id: Icb13891863d0b9b6a00e18d0f8f88e6306a24f8c
2017-12-27 16:59:38 -08:00
Bo Hu dbc18ce057 Merge "emulator: add check_emu_boot.mk, again" am: 59e41c11d5 am: d7c9a7384a
am: d49a41350a

Change-Id: I52094812c9214340800f6ed3f0674ff8405b7f0c
2017-12-27 22:32:45 +00:00
Bo Hu d49a41350a Merge "emulator: add check_emu_boot.mk, again" am: 59e41c11d5
am: d7c9a7384a

Change-Id: Id9b9e9d5421b6f5ba5717bd7c1a13ba8f3e4ac1d
2017-12-27 22:29:40 +00:00
Bo Hu d7c9a7384a Merge "emulator: add check_emu_boot.mk, again"
am: 59e41c11d5

Change-Id: I3ac17edc7dd2e170e36450eba9f988c29a8194f3
2017-12-27 22:26:34 +00:00
Bo Hu 59e41c11d5 Merge "emulator: add check_emu_boot.mk, again" 2017-12-27 22:22:10 +00:00
TreeHugger Robot f3872366bd Merge "Adds statsd to all builds." 2017-12-27 22:17:21 +00:00
Zach Riggle 6319deed41 Add support for honggfuzz to BUILD_FUZZ_TEST
Change-Id: I38f70d1a57649635be95c59187da05ba22fcf687
2017-12-27 22:08:27 +00:00
Sen Jiang 1e1c35d051 Merge "Remove zlib_fingerprint support." am: 53a3f70efe am: 2dfaacdd93
am: c5ed82950b

Change-Id: I25e86717bfaf7f22e41d417d16f7b18d55f26ff1
2017-12-27 21:00:08 +00:00
Sen Jiang c5ed82950b Merge "Remove zlib_fingerprint support." am: 53a3f70efe
am: 2dfaacdd93

Change-Id: I20d08538fd4642987bdca0aed226c393aa7579ce
2017-12-27 20:57:29 +00:00
Sen Jiang 2dfaacdd93 Merge "Remove zlib_fingerprint support."
am: 53a3f70efe

Change-Id: I4afcbc02ce4da3541319f62eba5ff27e161f335d
2017-12-27 20:54:15 +00:00
Treehugger Robot 53a3f70efe Merge "Remove zlib_fingerprint support." 2017-12-27 20:49:24 +00:00
Jae Shin fc52ef0a23 Merge "Add check to ensure PLATFORM_VNDK_VERSION is set" am: 13349ed3c2 am: a085258968
am: 2dc0a3860e

Change-Id: Ifb8947460156924ac8b682fa66aeaa23c3f3037a
2017-12-26 02:00:51 +00:00
Jae Shin 2dc0a3860e Merge "Add check to ensure PLATFORM_VNDK_VERSION is set" am: 13349ed3c2
am: a085258968

Change-Id: I7d541c300ef228ad045e168a0354ed690686c086
2017-12-26 01:57:46 +00:00
Jae Shin a085258968 Merge "Add check to ensure PLATFORM_VNDK_VERSION is set"
am: 13349ed3c2

Change-Id: Ibae825f9cc56606a01905f1b7bae9778275c0064
2017-12-26 01:55:07 +00:00
Treehugger Robot 13349ed3c2 Merge "Add check to ensure PLATFORM_VNDK_VERSION is set" 2017-12-26 01:51:20 +00:00
Steven Moreland ed48e5954a Merge "Allow devices to extend the system manifest." am: 15820578b2 am: 152a886de3
am: aac4256fd2

Change-Id: I8c42fd4b758466032cec45a762b079979d0f4fa6
2017-12-23 01:28:37 +00:00
Steven Moreland aac4256fd2 Merge "Allow devices to extend the system manifest." am: 15820578b2
am: 152a886de3

Change-Id: Id9c2f1be2b56c17fb8417a452b42bb98b4aa7b24
2017-12-23 01:25:37 +00:00
Steven Moreland 152a886de3 Merge "Allow devices to extend the system manifest."
am: 15820578b2

Change-Id: I23cbded9ac506c201bc4f8378dca124a68402f2e
2017-12-23 01:22:33 +00:00
Treehugger Robot 15820578b2 Merge "Allow devices to extend the system manifest." 2017-12-23 01:17:24 +00:00
Justin Yun 4b30958555 Merge "Use current VNDK directories if version is not set on GSI" am: a5af4d920f am: cc3924fd67
am: 72a9d21cb9

Change-Id: I155f4ac421a71e481289f17bdd8236ca442307b0
2017-12-23 00:47:33 +00:00
Justin Yun 72a9d21cb9 Merge "Use current VNDK directories if version is not set on GSI" am: a5af4d920f
am: cc3924fd67

Change-Id: I43850b8c451b9001a4046406fc79b2de6506d295
2017-12-23 00:43:58 +00:00
Justin Yun cc3924fd67 Merge "Use current VNDK directories if version is not set on GSI"
am: a5af4d920f

Change-Id: I6e5abd1191bd469765c5f610bb47d4b1c1baf22f
2017-12-23 00:41:24 +00:00
Treehugger Robot a5af4d920f Merge "Use current VNDK directories if version is not set on GSI" 2017-12-23 00:35:23 +00:00