Commit graph

39471 commits

Author SHA1 Message Date
Adam Seaton
4e140ce86a Update platform security string to 2017-10-05 in oc-dev Bug:64896113 2017-08-21 11:37:32 -07:00
Adam Seaton
80d3742026 Update platform security string to 2017-10-01 in oc-dev Bug:64896113 2017-08-21 11:36:54 -07:00
Adam Seaton
1517f3d2da [DO NOT MERGE] Update platform security string to 2017-10-05 in nyc-dev Bug:64896113 2017-08-21 11:26:49 -07:00
Adam Seaton
73ab80dec9 [DO NOT MERGE] Update platform security string to 2017-10-01 in nyc-dev Bug:64896113 2017-08-21 11:26:14 -07:00
Adam Seaton
cf83f5a4f3 [DO NOT MERGE] Update platform security string to 2017-10-01 in lmp-dev Bug:64896113 2017-08-21 11:08:37 -07:00
Adam Seaton
f2f5343ba1 [Do Not Merge] Update platform security string to 2017-10-01 in KLP dev
Bug:64896113
2017-08-21 10:52:18 -07:00
Tobias Thierer
7de79cbeaf Revert "Build support for 32-bit armv8-a"
This reverts commit 0daa78eef4.

Reason for revert: Broke the build for some targets (including marlin and angler).

$ make cts
build/core/combo/TARGET_linux-arm.mk:43: kryo is armv8-a.
build/core/combo/TARGET_linux-arm.mk:45: TARGET_2ND_ARCH_VARIANT, armv7-a-neon, ignored! Use armv8-a instead.
[...]
cts/tests/tests/os/jni/android_os_cts_CpuInstructions.cpp:88:20: error: instruction requires: armv7 or earlier
    asm volatile ( "swp r0, r0, [%0]" : "+r"(ptr) : : "r0" );
                   ^
<inline asm>:1:2: note: instantiated into assembly here
        swp r0, r0, [r1]
        ^

Change-Id: I65a91ed5a4461eca6646df13642a87a5c37d6c85
2017-08-21 15:03:16 +00:00
Narayan Kamath
a07bf049b9 releasetools: Add support for compressed APKs.
Compressed APKs can be identified by a "compressed=<ext>" entry in
the apkcerts.txt file. When we encounter such an entry, we need to
decompress the file to a temporary location before we process its
certs. When we're signing, we should also recompress the package
after it's signed.

Bug: 64531948
Test: ./build/tools/releasetools/check_target_files_signatures.py
Test: ./build/tools/releasetools/sign_target_files_apks.py
Test: compared signed output before / after this change, verify that
      it's bitwise identical when no compressed APKs are present.

Change-Id: Id32e52f9c11023955330c113117daaf6b73bd8c2
2017-08-21 13:21:20 +01:00
Bowgo Tsai
1f5e66c205 Merge "GSI: adds /odm mount point in root dir" into oc-mr1-dev
am: 76097d33b2

Change-Id: I9316c9cdacafb85920cb7a1ceff64c3cff27e37f
2017-08-21 01:43:23 +00:00
TreeHugger Robot
76097d33b2 Merge "GSI: adds /odm mount point in root dir" into oc-mr1-dev 2017-08-21 01:39:05 +00:00
Bowgo Tsai
2e2f6f2b75 Merge "64-bit GSI: adds init.zygote32_64.rc into root dir for vendor to select" into oc-mr1-dev
am: 35f997178a

Change-Id: I79f490a2ec637c5a60a8d019ab8e273a88a897b2
2017-08-20 05:21:39 +00:00
TreeHugger Robot
35f997178a Merge "64-bit GSI: adds init.zygote32_64.rc into root dir for vendor to select" into oc-mr1-dev 2017-08-20 05:14:04 +00:00
Isaac Chen
d9609dd5f1 Merge "Build support for 32-bit armv8-a" am: 70fe80491c am: ef1e443e14 am: 43b2504cd2
am: e5dd3915f7

Change-Id: Ib9ddb35eee30e8024b92515873b904cd0e30d89a
2017-08-19 06:25:45 +00:00
Isaac Chen
e5dd3915f7 Merge "Build support for 32-bit armv8-a" am: 70fe80491c am: ef1e443e14
am: 43b2504cd2

Change-Id: Ib2d66b827d2562dfc247fc97dc89baa960f735bf
2017-08-19 06:23:14 +00:00
Isaac Chen
43b2504cd2 Merge "Build support for 32-bit armv8-a" am: 70fe80491c
am: ef1e443e14

Change-Id: I4086a8e63dbda784686fd42fedd38dedbbac8771
2017-08-19 06:19:44 +00:00
Isaac Chen
ef1e443e14 Merge "Build support for 32-bit armv8-a"
am: 70fe80491c

Change-Id: I6b4291a893ff42eca1933b8783e342855f22917f
2017-08-19 06:16:49 +00:00
Isaac Chen
70fe80491c Merge "Build support for 32-bit armv8-a" 2017-08-19 06:10:56 +00:00
Jeff Gaston
9829f9a607 Merge "Revert "Revert "Use the Finder's results for faster searching""" am: 30928b0c6f am: b339102f67 am: 401b75c299
am: e05961ed95

Change-Id: Ib5ce6e22df36e1590333eb179ed33b1c44d12c88
2017-08-18 19:47:43 +00:00
Jeff Gaston
e05961ed95 Merge "Revert "Revert "Use the Finder's results for faster searching""" am: 30928b0c6f am: b339102f67
am: 401b75c299

Change-Id: I02702cfafe58b6e6c249a37ee9e3ea3178d5bdcc
2017-08-18 19:41:12 +00:00
Jeff Gaston
401b75c299 Merge "Revert "Revert "Use the Finder's results for faster searching""" am: 30928b0c6f
am: b339102f67

Change-Id: I660b803f5cdc5e31f6b06373e555718505bcf84d
2017-08-18 19:35:43 +00:00
Jeff Gaston
b339102f67 Merge "Revert "Revert "Use the Finder's results for faster searching"""
am: 30928b0c6f

Change-Id: I8571745e8e37b87e5762438aff589f3132a3a428
2017-08-18 19:29:44 +00:00
Jeff Gaston
30928b0c6f Merge "Revert "Revert "Use the Finder's results for faster searching""" 2017-08-18 19:21:38 +00:00
Jiyong Park
905f56a24f Merge "cxx_stl_setup is not executed for modules from soong" into oc-mr1-dev
am: ee67a45175

Change-Id: I0ed3b20fa6546332d7b1d87ff9eb8af971b0abdc
2017-08-18 18:52:12 +00:00
TreeHugger Robot
ee67a45175 Merge "cxx_stl_setup is not executed for modules from soong" into oc-mr1-dev 2017-08-18 18:31:14 +00:00
Bowgo Tsai
882c99a33b GSI: adds /odm mount point in root dir
Bug: 64700195
Test: boot A/B device with /odm
Change-Id: Ie014a052a333b2cb8d89bc43e4326be81e638dcd
2017-08-18 16:18:35 +08:00
Jiyong Park
7e56e20ce4 Merge "cxx_stl_setup is not executed for modules from soong" am: 9b18ed094c am: a0f2b2a286 am: 7eb54c4438
am: 4ac81f630b

Change-Id: I16c144fc6de8cd8026c0676a67a53819edfa1e7c
2017-08-18 07:45:25 +00:00
Jiyong Park
4ac81f630b Merge "cxx_stl_setup is not executed for modules from soong" am: 9b18ed094c am: a0f2b2a286
am: 7eb54c4438

Change-Id: Id432afccbf025527d9024f2711f9de871908f86a
2017-08-18 07:34:23 +00:00
Jiyong Park
7eb54c4438 Merge "cxx_stl_setup is not executed for modules from soong" am: 9b18ed094c
am: a0f2b2a286

Change-Id: I4ff30a7156cd472eac3226d4854e79eaa32d973c
2017-08-18 07:22:53 +00:00
Jiyong Park
a0f2b2a286 Merge "cxx_stl_setup is not executed for modules from soong"
am: 9b18ed094c

Change-Id: I08bfd781403ed0b7dd68de2e1045f1fa194bc8f5
2017-08-18 07:16:54 +00:00
Treehugger Robot
9b18ed094c Merge "cxx_stl_setup is not executed for modules from soong" 2017-08-18 07:11:41 +00:00
Bowgo Tsai
500e28877c Merge "resolve merge conflicts of b726558507 to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp 2017-08-18 05:56:25 +00:00
Jiyong Park
82962a982c cxx_stl_setup is not executed for modules from soong
cxx_stl_setup is adding libunwind_llvm to the dependency even for
modules from soong. However, since this dependency was already handled
in soong, those modules don't need to go through it again.

Bug: 64815735
Test: BOARD_VNDK_VERSION=current mma -j (under /hardware/libhardware)

Merged-Id: Id6e2547c752ec831aa56a14c0bf4db0a55d51243
Change-Id: Id6e2547c752ec831aa56a14c0bf4db0a55d51243
(cherry picked from commit 425d489cb9)
2017-08-18 14:16:11 +09:00
Dan Albert
880f76e53e Merge "Use the min sdk version from soong." am: 22b45d401a am: 21751a0a67 am: 66383baf27
am: 821638e8bb

Change-Id: I6501f10b040178a7cf84faf4f49da4c275306234
2017-08-18 05:03:15 +00:00
Dan Albert
821638e8bb Merge "Use the min sdk version from soong." am: 22b45d401a am: 21751a0a67
am: 66383baf27

Change-Id: I716cc072baf1019af6671b3ce6db6d0698640ec6
2017-08-18 04:52:43 +00:00
Jiyong Park
425d489cb9 cxx_stl_setup is not executed for modules from soong
cxx_stl_setup is adding libunwind_llvm to the dependency even for
modules from soong. However, since this dependency was already handled
in soong, those modules don't need to go through it again.

Bug: 64815735
Test: BOARD_VNDK_VERSION=current mma -j (under /hardware/libhardware)

Change-Id: Id6e2547c752ec831aa56a14c0bf4db0a55d51243
2017-08-18 13:46:04 +09:00
Bowgo Tsai
3034b9ae90 resolve merge conflicts of b726558507 to oc-mr1-dev-plus-aosp
Change-Id: I0e2f94ac6d6fce944e5b421e4c24a8a73ea03651
2017-08-18 12:22:13 +08:00
TreeHugger Robot
b726558507 Merge "Copy adbd from system/bin to recovery/root/sbin" into oc-mr1-dev 2017-08-18 03:52:36 +00:00
Bowgo Tsai
cccd0b2a30 64-bit GSI: adds init.zygote32_64.rc into root dir for vendor to select
For 64-bit GSI, there are two different zygote settings:
  1. 64-bit primary, 32-bit secondary (init.zygote64_32.rc) OR
  2. 32-bit primary, 64-bit secondary (init.zygote32_64.rc)
  3. 64-bit only is currently forbidden (b/64280459#comment6)

This change adds the second setting into root dir for vendor.img to
select. The first setting already exists.

PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote64_32 is removed
because the property will be put into vendor.img. i.e., it has no effect
on GSI.

Bug: 64280459
Test: build and boot device, checks init.zygote32_64.rc is in rootdir
Change-Id: I16b36018acac8cfeee7281d6f4b6c9c19467abec
2017-08-18 11:29:45 +08:00
Dan Albert
66383baf27 Merge "Use the min sdk version from soong." am: 22b45d401a
am: 21751a0a67

Change-Id: I29d272bb13da1bc34f34005e5df76f961f75af63
2017-08-18 03:25:41 +00:00
Jeff Gaston
d05050ee9c Revert "Revert "Use the Finder's results for faster searching""
This reverts commit 6f2aea5636.

Reason for revert: Fix went in ( I70b08023b94b5789dc8394651bbac4c49c82787f ); trying again to use this

Change-Id: I0f58c21a7312dda01980d338401e756f610fe3b4
2017-08-18 02:46:39 +00:00
Dan Albert
21751a0a67 Merge "Use the min sdk version from soong."
am: 22b45d401a

Change-Id: I3baca77b2774eb93168f6b888f08e8f0e56a1a10
2017-08-18 02:44:33 +00:00
Treehugger Robot
22b45d401a Merge "Use the min sdk version from soong." 2017-08-18 02:34:36 +00:00
Dan Albert
105e4fe0a6 Use the min sdk version from soong.
Test: make checkbuild
Bug: None
Change-Id: I0306803cebf98748503b7e217db0f0f5959bf4f7
2017-08-17 16:37:49 -07:00
Colin Cross
dd7a032294 Merge "Fix typo when building aar" am: f759166bb8 am: 152ac2818a am: 5c1f478231
am: db17f2acf8

Change-Id: I8152c1e7bbacb649ec8888594d865bc1d1153321
2017-08-17 22:57:43 +00:00
Colin Cross
db17f2acf8 Merge "Fix typo when building aar" am: f759166bb8 am: 152ac2818a
am: 5c1f478231

Change-Id: Ib4eb4ed660089c86494411f8f9d3be33cb601dc0
2017-08-17 22:40:08 +00:00
Colin Cross
5c1f478231 Merge "Fix typo when building aar" am: f759166bb8
am: 152ac2818a

Change-Id: I0600a3a7da597296932c8df091028dbf97e240a9
2017-08-17 22:36:47 +00:00
Colin Cross
152ac2818a Merge "Fix typo when building aar"
am: f759166bb8

Change-Id: I4f4ffef85f5f3935d157f9e216e057df95fa62dd
2017-08-17 22:33:46 +00:00
Treehugger Robot
f759166bb8 Merge "Fix typo when building aar" 2017-08-17 22:22:09 +00:00
Jeff Gaston
46c9cfa1d1 Merge "Revert "Use the Finder's results for faster searching"" am: 6df0626e58 am: 8467fba043 am: 12a4b403c2
am: 97079e0557

Change-Id: I19389b739e792372fa1d189d030c5a1d618b7b19
2017-08-17 20:36:11 +00:00
Jeff Gaston
97079e0557 Merge "Revert "Use the Finder's results for faster searching"" am: 6df0626e58 am: 8467fba043
am: 12a4b403c2

Change-Id: I54466fe90cdab68e4c23cb09e2389ace494384ba
2017-08-17 20:31:35 +00:00