Dan Willemsen
4d20d14143
Remove GLOBAL_LD_DIRS am: e5836c4bb0
...
am: 28cf7d49ab
Change-Id: I35109a1e1ec6fb546da0e4cf439e670d4f8c8cd0
2016-11-29 20:47:27 +00:00
Dan Willemsen
28cf7d49ab
Remove GLOBAL_LD_DIRS
...
am: e5836c4bb0
Change-Id: I6683ed19bff601075e82065c5c1dc783d62249b4
2016-11-29 20:42:26 +00:00
Tao Bao
1eb115c6e8
Makefile: Pack verity_verifier into otatools.zip. am: 7bb3aff71c am: ad8924117d am: 7981d953a9
...
am: 41fd473e45
Change-Id: I096bab71bc1bdf3cfd9e8ede276504b65313af9c
2016-11-29 00:28:07 +00:00
Tao Bao
41fd473e45
Makefile: Pack verity_verifier into otatools.zip. am: 7bb3aff71c am: ad8924117d
...
am: 7981d953a9
Change-Id: I8ccc7c02e2c577293b7bfc29759b79f1908863d8
2016-11-29 00:24:05 +00:00
Tao Bao
7981d953a9
Makefile: Pack verity_verifier into otatools.zip. am: 7bb3aff71c
...
am: ad8924117d
Change-Id: Ia766ef6038434d8435a81f7e921de2936fd33411
2016-11-29 00:19:36 +00:00
Tao Bao
ad8924117d
Makefile: Pack verity_verifier into otatools.zip.
...
am: 7bb3aff71c
Change-Id: Iffb447dea7f4b227edf5311229ea0902bb4b25f5
2016-11-29 00:15:05 +00:00
Zheng Zhang
c898fcdef0
Merge "DO NOT MERGE: build_image: add padding to match partition size" into cw-f-dev
...
am: 28b96d1470
Change-Id: I15652b49a63793ca7a6783d92a069114a31da672
2016-11-29 00:05:56 +00:00
Sami Tolvanen
0badc6ba69
DO NOT MERGE: build_image: add padding to match partition size
...
am: 9a675c94d3 -s ours
Change-Id: If0f79158a14fb0ee565990fa32cf899ec346b12f
2016-11-29 00:05:40 +00:00
Adam Seaton
5eef4cc855
Merge changes I30f397b0,I717a6f03 into lmp-dev am: 1a242b67fe am: 27ac4ac1da am: ac64c64f9a am: 618f64d183 am: d635edfd04 am: 6f0c3f4bdc am: c5ecbe4047 am: 4a45d769e9 am: e033ae9cff am: 8185ca3cd3
...
am: 777b8bb190
Change-Id: I44b2a75e03bf46c5426cf4da1c4ea09f3717b487
2016-11-28 22:19:24 +00:00
Adam Seaton
282cc6fe0f
Updating Security String to 2017-01-05 am: 26250019df am: 6a9981128d am: 1691e69497 -s ours am: 4d3fa3f47e am: 26f54a9c9d am: 1685901f54 am: de90bd9c11 am: 373d596d29 am: d4318b4dd8 am: 6b712cfc00
...
am: f374f992fa
Change-Id: I5e59a22b40f793afab182894c9bc4df40c96dd43
2016-11-28 22:19:15 +00:00
Adam Seaton
6d4c579d2b
Updating Security String to 2017-01-01 am: a0985a838b am: 542e90b0be am: 99abf297d8 -s ours am: 8316b162d9 am: 3d6c04a185 am: 954e945541 am: 00e57d1e7d am: 69324d3272 am: aca891ceb7 am: c7c9e9e6ae
...
am: da23655530
Change-Id: I544e10e76fa66a1ef42c366eb79933ac21f314fc
2016-11-28 22:19:05 +00:00
Adam Seaton
df382f1185
Update Security String to 2017-01-05 in klp-dev am: 4f483f18e7 am: b2cc64fdd5 am: 3fa1b8a55e -s ours am: 7fa6402d8e am: 70849c073b am: 85e8b1c54f am: a0e047834c am: e515169acc am: 925cdbcc44 am: 3b6d4247d4 am: fc9a3a6289 am: e6228c3c29 am: 26cd57c3dd
...
am: 973cf83398
Change-Id: I02df1a95bdf119011de936a7ddfccee79de91c10
2016-11-28 22:18:40 +00:00
Adam Seaton
a182ec2750
Update Security string to 2017-01-01 in klp-dev am: 21f5d281f3 am: 0f344dd00a am: a50e96923c -s ours am: 6a89a1936f am: 2652d28bea am: a8cedadbf9 am: f1372e43e5 am: 27202c78b9 am: 0ab37afc51 am: 23654fcee6 am: 49ab1b9aec am: 4066fd01b1 am: c9372a0cf7
...
am: 8755a73c93
Change-Id: Ie472dfdae1fac4a5c7112141f63030cd4b6ae00c
2016-11-28 22:18:29 +00:00
Adam Seaton
96700aebc9
Updating Security String to 2017-01-05 on mnc-dev am: 5e46dc2215 am: f57eb8ce2d am: b81dff49dc am: b25cb027ea -s ours am: d74f26b3bf am: 54bfae5f11 am: 23ecbbbe31
...
am: 01ccb41c44
Change-Id: I70566cb5f2933dd2d59bfcee050fec81f40d7f1b
2016-11-28 22:18:01 +00:00
Adam Seaton
2574815b8f
Updating Security string to 2017-01-01 on mnc-dev am: 7224901e6b am: 5b54c86fb7 am: 0ca9715ced am: 1512b79479 -s ours am: 6eb9073057 am: 25d73fa79b am: 989a7633f7
...
am: 813ec07751
Change-Id: I11be60d37a54f481c97b9cadbbc092226d662bfc
2016-11-28 22:17:50 +00:00
Adam Seaton
63c8e1ea9d
Updating Security String to 2017-01-05 on nyc-dev am: 190129bc61 am: b9085822a5 am: 091dea5c83
...
am: 223b79e356
Change-Id: I2348ef3b34370e4bbc5634a17565cfc2d54b0217
2016-11-28 22:17:27 +00:00
Adam Seaton
0d0a1221d0
Updating Security String to 2017-01-01 on nyc-dev am: 202380f93e am: 6108f21d36 am: 6a954bbdbc
...
am: 2e5e286112
Change-Id: I25ce54c3b60632005f4c5d6a76241f9a996d9961
2016-11-28 22:17:21 +00:00
Tao Bao
da41e1d30c
releasetools: Use java_path in sign_target_files_apks.py. am: cd4f7c96c0 am: 6414a94c50 am: 4722fc1734
...
am: e6a27e7e69
Change-Id: I091d4adc8e6d153ed77b41a27b90b2642c8d0f72
2016-11-28 22:17:06 +00:00
Alexander Levitskiy
a814c15a86
Merge "build: tools: Add json collection of installed files with hashes." into cw-f-dev
...
am: 343d72fac8 -s ours
Change-Id: Ie5dd7f5e7cc3cabb9688dbc0d5ca602b7d85feec
2016-11-28 22:16:44 +00:00
Sasha Levitskiy
121f83aa77
build: tools: Add json collection of installed files with hashes.
...
am: 3c97fa78cd -s ours
Change-Id: Ida939796284dc13f5e06ac8541253ab453c4ec2d
2016-11-28 22:16:42 +00:00
Tao Bao
80955ccc97
releasetools: Support verity signer args. am: c7814837a0 am: 8a6d94c9aa am: b31f486d75
...
am: 53a1acf53b
Change-Id: If1943ed19ad26d00be65ba864b0372aafaaca2a7
2016-11-28 22:16:08 +00:00
Dan Willemsen
e5836c4bb0
Remove GLOBAL_LD_DIRS
...
The last user of this was the NDK, which has been using full paths in
binary.mk. So remove it.
Test: lunch aosp_arm-eng; m -j native
Change-Id: Ida2523a2d19131ee3ef005edb3e5bcf830710b11
2016-11-28 13:46:17 -08:00
Tao Bao
7442e47c84
Merge "Makefile: Pack verity_verifier into otatools.zip." am: 31543713fc
...
am: 5cd53f7e22
Change-Id: Iddf347069d59f2e6e90e509e1768f5fffbff1cf3
2016-11-28 18:17:57 +00:00
Tao Bao
24ed10c0cb
Makefile: Pack verity_verifier into otatools.zip. am: 7f02f3413b
...
am: 3b35352e1b
Change-Id: Ia25e3e004abce18bbd05001b783a2eeda1717e20
2016-11-28 18:17:42 +00:00
Tao Bao
5cd53f7e22
Merge "Makefile: Pack verity_verifier into otatools.zip."
...
am: 31543713fc
Change-Id: I94587dc4f80edd61d5d414742513c4360609259f
2016-11-28 18:13:45 +00:00
Tao Bao
3b35352e1b
Makefile: Pack verity_verifier into otatools.zip.
...
am: 7f02f3413b
Change-Id: Ib9c73dd16016b582dbaf2c40ebfc9b20c1adabe3
2016-11-28 18:13:43 +00:00
Tao Bao
7bb3aff71c
Makefile: Pack verity_verifier into otatools.zip.
...
verity_verifier is needed when verifying verity metadata.
Bug: 32173582
Test: `m otatools-package`
Change-Id: I63fdeb75cdca10ea38c1df978d64701acdd4c1db
(cherry picked from commit 7f02f3413b )
2016-11-28 10:05:45 -08:00
Tao Bao
31543713fc
Merge "Makefile: Pack verity_verifier into otatools.zip."
2016-11-28 18:04:04 +00:00
Tao Bao
7f02f3413b
Makefile: Pack verity_verifier into otatools.zip.
...
verity_verifier is needed when verifying verity metadata.
Bug: 32173582
Test: `m otatools-package`
Change-Id: I63fdeb75cdca10ea38c1df978d64701acdd4c1db
2016-11-22 15:36:57 -08:00
Ian Rogers
0be9b84218
Merge "Update warn.py for new Error Prone diagnostics" am: 7ed3af23a8
...
am: 1eef968704
Change-Id: I853848314ffce962a8b0c5dcf5cfc99343461e88
2016-11-22 18:53:21 +00:00
Ian Rogers
1eef968704
Merge "Update warn.py for new Error Prone diagnostics"
...
am: 7ed3af23a8
Change-Id: Iae1dec6c0b48be23d874c01b9d87627bbf0c0caf
2016-11-22 18:50:21 +00:00
Ian Rogers
7ed3af23a8
Merge "Update warn.py for new Error Prone diagnostics"
2016-11-22 18:43:51 +00:00
Nick Glorioso
8a7b25c736
Update warn.py for new Error Prone diagnostics
...
Test: Local build, tee'd to file, ran warn.py and checked output HTML
Change-Id: Iee3386e88c73e4b8e0a1fcc60105ee5fb86e3cb0
2016-11-22 10:35:07 -08:00
Zheng Zhang
28b96d1470
Merge "DO NOT MERGE: build_image: add padding to match partition size" into cw-f-dev
2016-11-20 06:22:17 +00:00
Dan Albert
1cb992bc8e
Merge "Support LOCAL_SDK_VERSION := current for NDK." am: c7d2fe614e
...
am: 6cac9ba834
Change-Id: If64f88bee6162adada642ddedcf84747443068cc
2016-11-18 19:12:37 +00:00
Dan Albert
6cac9ba834
Merge "Support LOCAL_SDK_VERSION := current for NDK."
...
am: c7d2fe614e
Change-Id: Ibf9a4ffa74f5d05f68bd34db908fe4e5a67fe173
2016-11-18 19:09:36 +00:00
Treehugger Robot
c7d2fe614e
Merge "Support LOCAL_SDK_VERSION := current for NDK."
2016-11-18 19:04:40 +00:00
Andreas Gampe
7cfb848e4e
Merge "Build: Bring back SDK dependencies" am: eb06c77b80
...
am: 2a2442c6f2
Change-Id: I6f3331782124fe9447b6fc2eda1727a2bb645be7
2016-11-18 02:59:28 +00:00
Andreas Gampe
2a2442c6f2
Merge "Build: Bring back SDK dependencies"
...
am: eb06c77b80
Change-Id: I0c15adcd387980b94c5544427d4f4fdad3f7ff31
2016-11-18 02:57:28 +00:00
Andreas Gampe
eb06c77b80
Merge "Build: Bring back SDK dependencies"
2016-11-18 02:53:29 +00:00
Andreas Gampe
ff00c5d78f
Build: Bring back SDK dependencies
...
Temporarily re-add SDK dependencies to runtime_libart.mk.
Test: m sdk_repo
Change-Id: I5c2054d7be6ea1c5e6eadbcb3453cabfc64728d6
2016-11-17 18:21:36 -08:00
Andreas Gampe
41e7b3d871
Merge "Build: Refactor and clean up runtime_libart" am: 020f5275d5
...
am: bd7d5aea2a
Change-Id: I203c3da1abfc17a22eaedf719dd13a2b083a8680
2016-11-18 01:34:20 +00:00
Andreas Gampe
bd7d5aea2a
Merge "Build: Refactor and clean up runtime_libart"
...
am: 020f5275d5
Change-Id: Ifff0829fe3b7e306527e3654ee3833a1935c1ac3
2016-11-18 01:32:20 +00:00
Treehugger Robot
020f5275d5
Merge "Build: Refactor and clean up runtime_libart"
2016-11-18 01:25:53 +00:00
William Roberts
15e654392a
Merge "fs_config: move sort to be consistent with other sort" am: 052a01958c
...
am: c06559eb7b
Change-Id: I2acabfd1f5912da126dbc31559e3b458810e75d0
2016-11-18 01:12:16 +00:00
William Roberts
c06559eb7b
Merge "fs_config: move sort to be consistent with other sort"
...
am: 052a01958c
Change-Id: If18ab459d74e20f96db56d80ecdbf94580583463
2016-11-18 00:57:15 +00:00
Treehugger Robot
052a01958c
Merge "fs_config: move sort to be consistent with other sort"
2016-11-18 00:29:53 +00:00
William Roberts
8dfc55363e
Merge "fs_config: correct README" am: 4baaf905ee
...
am: 2088e57ed8
Change-Id: Ieb523540e0f7ec0e79f52e434d4914e4c1ba47c5
2016-11-17 23:58:16 +00:00
Andreas Gampe
6cb66e246c
Merge "Build: Add agent library to default packages" am: 709aaa5aea
...
am: 349b67c6ba
Change-Id: I5c0155b04ef5846b5cc53fb9933bd2998d14b2ae
2016-11-17 23:58:02 +00:00
William Roberts
2088e57ed8
Merge "fs_config: correct README"
...
am: 4baaf905ee
Change-Id: I1a3fa8a296608205a29efb94c32fbfd14d4844f2
2016-11-17 23:42:52 +00:00