Narayan Kamath
122d1546d7
Merge "zipalign: Remove dependency on androidfw." am: 9709191837
...
am: cc498428e5
Change-Id: I8feb5facf8932943e11d27061d54fbaf88b02843
2017-11-01 11:40:02 +00:00
Narayan Kamath
cc498428e5
Merge "zipalign: Remove dependency on androidfw."
...
am: 9709191837
Change-Id: I0bbb10611680ec72cd932bbac6cf3c056c8afa6b
2017-11-01 11:17:26 +00:00
Narayan Kamath
9709191837
Merge "zipalign: Remove dependency on androidfw."
2017-11-01 11:12:18 +00:00
Jaekyun Seok
9ef0c230c1
Merge "Rename ro.vendor.product.* to ro.product.vendor.*" am: 9e622c7e06
...
am: e4d8ef1ba7
Change-Id: I6a8983e41b6bace2bfb80dffc6520a57c5379a9f
2017-11-01 03:08:29 +00:00
Jaekyun Seok
e4d8ef1ba7
Merge "Rename ro.vendor.product.* to ro.product.vendor.*"
...
am: 9e622c7e06
Change-Id: Ifd3659750be3d00da7ef97cc8547e56c645d85a5
2017-11-01 02:57:49 +00:00
Shubham Ajmera
a9618556fc
Merge "Add compiler filter for inactive app downgrade" am: f1b2aebc54
...
am: e8f4ed3b56
-s ours
Change-Id: Ic3a0e0665640925bb3014d4e82e8ca690a739a21
2017-11-01 02:37:56 +00:00
Shubham Ajmera
e8f4ed3b56
Merge "Add compiler filter for inactive app downgrade"
...
am: f1b2aebc54
Change-Id: I330f0dfbe6bdeecd1f5998c9b605d0907ab46674
2017-11-01 02:29:14 +00:00
Treehugger Robot
9e622c7e06
Merge "Rename ro.vendor.product.* to ro.product.vendor.*"
2017-11-01 02:23:54 +00:00
Treehugger Robot
f1b2aebc54
Merge "Add compiler filter for inactive app downgrade"
2017-11-01 02:19:58 +00:00
Jaekyun Seok
43c2f8aeee
Rename ro.vendor.product.* to ro.product.vendor.*
...
"ro.vendor." prefix will be used only for vendor-specific properties
except for ro.vendor.build.date, ro.vendor.build.date.utc and
ro.vendor.build.fingerprint.
Those exceptions have been used since Android L. So we can't rename them
to support the system-only upgrade from old Android.
Bug: 36796459
Test: confirmed that ro.vendor.product.* were changed to
ro.product.vendor.* in vendor/build.prop
Merged-In: Ibc107b00264a2dc194261d1968b27a9b17b5d798
Change-Id: Ibc107b00264a2dc194261d1968b27a9b17b5d798
(cherry picked from commit 8cf6443264
)
2017-11-01 10:11:32 +09:00
Colin Cross
7d25afa395
Merge "Export AAPT-related variables to soong" am: 9767853ed0
...
am: 389e8fe140
Change-Id: I002187a6a2d3f1c8f618b6553619a7cd59085b76
2017-11-01 00:11:45 +00:00
Colin Cross
389e8fe140
Merge "Export AAPT-related variables to soong"
...
am: 9767853ed0
Change-Id: Id14503c30d67d3ad8cb196ee61afca8bf0522177
2017-10-31 23:43:52 +00:00
Treehugger Robot
9767853ed0
Merge "Export AAPT-related variables to soong"
2017-10-31 23:39:24 +00:00
Alex Klyubin
a23ac980f0
Merge "Add OWNERS for SignApk" am: 9a04e12eba
...
am: d47e269bf2
Change-Id: I126c9eee0f8459cc652c3b6ba959badc4de1796f
2017-10-31 23:30:00 +00:00
Tao Bao
5275117088
Merge "releasetools: Remove the deprecated flag --board_config." am: 224b5f9926
...
am: 076dd6aa85
Change-Id: I88accd860310ca3fdfdb6644a25505208dbeb277
2017-10-31 23:29:10 +00:00
Steven Moreland
6a6143f10e
Merge "Add hwbinder.jar to PDK." am: 46e7f55f6d
...
am: d3a514b2c8
Change-Id: I969567e8d0dd5babf85c0b5cf1bde86691da37c9
2017-10-31 23:28:09 +00:00
Tao Bao
08fe2b65cd
Merge "releasetools: Fix the wrong command when falling back to bsdiff." am: f2a3454fa5
...
am: e1c0604259
Change-Id: I806f248d671b344dd5e201c787eb374e4a6ea625
2017-10-31 23:26:57 +00:00
Colin Cross
95411b64da
Merge "Revert "CFI compatibility with static executables and nested archives"" am: 66a11b7ccc
...
am: cd9bfc57fc
Change-Id: I96c60a0846e750be23c6fd2816b41fc73b90a455
2017-10-31 23:25:16 +00:00
Alex Klyubin
d47e269bf2
Merge "Add OWNERS for SignApk"
...
am: 9a04e12eba
Change-Id: I4712cf358a2d86ac23aeb384e1272b24d68b15f1
2017-10-31 22:13:08 +00:00
Tao Bao
076dd6aa85
Merge "releasetools: Remove the deprecated flag --board_config."
...
am: 224b5f9926
Change-Id: I35da7f5849acd9dce0ae609613a3b865b06ee0b9
2017-10-31 22:12:06 +00:00
Steven Moreland
d3a514b2c8
Merge "Add hwbinder.jar to PDK."
...
am: 46e7f55f6d
Change-Id: Ic76d569dfe85c61e267bc8e0be9fdf598a98e6a7
2017-10-31 22:11:18 +00:00
Tao Bao
e1c0604259
Merge "releasetools: Fix the wrong command when falling back to bsdiff."
...
am: f2a3454fa5
Change-Id: I262326ca26c42bcca1c712aaffd316e629a33f8c
2017-10-31 22:10:22 +00:00
Tao Bao
c6f0d75e57
Merge "releasetools: Fix the comment for '--verify' flag." am: f9b1b4c37d
...
am: 4c38da5b2e
Change-Id: I05a6cd2b85c34d22df156b9cba4c95cd7d8103ce
2017-10-31 22:09:06 +00:00
Colin Cross
cd9bfc57fc
Merge "Revert "CFI compatibility with static executables and nested archives""
...
am: 66a11b7ccc
Change-Id: Iadec04056ea267d5e2d3477d0f234d6f0ce1d83c
2017-10-31 22:09:02 +00:00
Tao Bao
4c38da5b2e
Merge "releasetools: Fix the comment for '--verify' flag."
...
am: f9b1b4c37d
Change-Id: I022bef13079404cb8079548ef568872694a504d3
2017-10-31 22:03:19 +00:00
Treehugger Robot
9a04e12eba
Merge "Add OWNERS for SignApk"
2017-10-31 21:53:45 +00:00
Tao Bao
224b5f9926
Merge "releasetools: Remove the deprecated flag --board_config."
2017-10-31 21:36:45 +00:00
Treehugger Robot
46e7f55f6d
Merge "Add hwbinder.jar to PDK."
2017-10-31 21:30:48 +00:00
Steven Moreland
266632f327
Add hwbinder.jar to PDK.
...
This is a no-install subset of frameworks.jar. Required
for HIDL libraries to be able to be built against at
build time.
Bug: 68433855
Test: hwbinder_intermediates are in platform.zip
Change-Id: Ia879c6a6908c00069eaf819278c9d5da6a649b68
2017-10-31 21:30:28 +00:00
Tao Bao
f2a3454fa5
Merge "releasetools: Fix the wrong command when falling back to bsdiff."
2017-10-31 21:11:56 +00:00
Colin Cross
66a11b7ccc
Merge "Revert "CFI compatibility with static executables and nested archives""
2017-10-31 21:01:41 +00:00
Treehugger Robot
f9b1b4c37d
Merge "releasetools: Fix the comment for '--verify' flag."
2017-10-31 21:00:19 +00:00
Dan Willemsen
d0ed98de63
Merge "Remove make version check" am: 41f54061b2
...
am: dc4ed6e4b5
Change-Id: Idb26a320888a3e9ac482f3127942010fdfbcaad9
2017-10-31 20:41:18 +00:00
Dan Willemsen
dc4ed6e4b5
Merge "Remove make version check"
...
am: 41f54061b2
Change-Id: I8649e3a3e9e372b42dfaaa4fb07c80ed64a779dd
2017-10-31 20:37:12 +00:00
Treehugger Robot
41f54061b2
Merge "Remove make version check"
2017-10-31 20:31:27 +00:00
Dan Willemsen
edb0a0e149
Merge "Mark some TARGET_* inputs as readonly" am: badd598c98
...
am: db0f20385a
Change-Id: I83bbcc4d926e3435f7a4cbdf27d43fe7562d1dd9
2017-10-31 19:50:42 +00:00
Dan Willemsen
db0f20385a
Merge "Mark some TARGET_* inputs as readonly"
...
am: badd598c98
Change-Id: I991fc456f18e2827c962509a5db54c2c7c16da69
2017-10-31 19:48:06 +00:00
Dan Willemsen
badd598c98
Merge "Mark some TARGET_* inputs as readonly"
2017-10-31 19:43:55 +00:00
Alex Klyubin
c6c6dfe742
Add OWNERS for SignApk
...
Test: build/make/tools/checkowners.py -c -v OWNERS
Bug: 30972906
Change-Id: I7a2c9301376e24239924ffbedcb2b97727da700a
2017-10-31 12:36:04 -07:00
Victor Hsieh
2d43232c24
Merge "Migrate to the new apksig API" am: da343de3ba
...
am: 9d3b6c2ec4
Change-Id: I7a52983656e26b6ba98655f249f2522380ad6768
2017-10-31 19:27:10 +00:00
Victor Hsieh
9d3b6c2ec4
Merge "Migrate to the new apksig API"
...
am: da343de3ba
Change-Id: I4022a94ff5f7d4064e35204e42e69943cd3f2d57
2017-10-31 19:25:05 +00:00
Treehugger Robot
da343de3ba
Merge "Migrate to the new apksig API"
2017-10-31 19:19:52 +00:00
Tao Bao
4b76a0e9ee
releasetools: Remove the deprecated flag --board_config.
...
It has been long deprecated since commit
fdd8e69c42
(Donut).
Test: `m dist` with aosp_marlin-userdebug and aosp_angler-userdebug.
Test: No user of "--board_config" in code search.
Change-Id: Ic0336c22cac32de5de88161748d09b579f892e99
2017-10-31 12:16:48 -07:00
Tao Bao
d41c9179d2
releasetools: Fix the wrong command when falling back to bsdiff.
...
Commit b937ead5d9
added the fallback to
bsdiff on imgdiff failures. However, it missed setting the transfer
style accordingly, which led to patch header mismatch.
Bug: 68659848
Test: Generate an incremental that has the fallback from imgdiff to
bsdiff. Examine the generated transfer list and verify that it has
"bsdiff" for the fallback command.
Change-Id: I55e46879d590a8af82ea796b9d98ffdb30360408
2017-10-31 12:09:07 -07:00
Tao Bao
edb35b85e2
releasetools: Fix the comment for '--verify' flag.
...
'-v' is not the abbreviation for '--verify' (but for '--verbose'
instead).
Test: N/A
Change-Id: I86339a1f7ea538d88ac6ed61595361531b79065c
2017-10-31 11:55:41 -07:00
Orion Hodson
8350c4c540
Revert "CFI compatibility with static executables and nested archives"
...
This reverts commit 3d3e1cf260
.
Rationale: part of a group of commits that left aosp_x86_64 not
building. (See https://android-build.googleplex.com/builds/
submitted/4426589/aosp_x86_64-eng/latest/logs/build_error.log)
Bug: 30227045
Test: builds
Change-Id: Ie22590abe3d1cdccb8d141baf6480d49dedf8789
2017-10-31 17:41:16 +00:00
Shubham Ajmera
c5966a35ca
Add compiler filter for inactive app downgrade
...
(cherry picked from commit 572a3df7fc
)
Bug: 36598475
Test: Verified the property value on the device
Merged-In: I8afcffcb7064ff6a3b97c26ee18aa22f969ffef3
Change-Id: I8afcffcb7064ff6a3b97c26ee18aa22f969ffef3
2017-10-31 10:03:14 -07:00
Victor Hsieh
d50662502f
Migrate to the new apksig API
...
Following the new API contract, this effectively add extra padding
before central dir to make it 4KB aligned.
Test: build succeeded
Bug: 30972906
Change-Id: I7cac9d2c4371b473c88df867b3b2ae906443db10
2017-10-31 08:24:02 -07:00
Justin Yun
ef4f57af4a
resolve merge conflicts of eb247544a7
to oc-mr1-dev-plus-aosp
...
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ib0c5ade0a1db65491b21226d5a2686ff6cf32d74
2017-10-31 15:27:52 +09:00
Justin Yun
eb247544a7
Merge "Use vndk-sp phony module for vndk-sp package list"
...
am: d75168135a
Change-Id: I660ac95e4ae8b1a966cb590157c23316234df4ce
2017-10-31 05:44:51 +00:00