Commit graph

38898 commits

Author SHA1 Message Date
Tobias Thierer
bc9829fb3f Merge "Revert "Build support for 32-bit armv8-a"" am: 1da1c6d056 am: 0d35b9fba3
am: ff4ba02d5b

Change-Id: I1d112aad1ebb715fa4990db53ed1347a9e8bf11c
2017-08-22 10:48:44 +00:00
Tobias Thierer
ff4ba02d5b Merge "Revert "Build support for 32-bit armv8-a"" am: 1da1c6d056
am: 0d35b9fba3

Change-Id: Id2ed78457ec3014812326ee34895bf705c741052
2017-08-22 10:42:35 +00:00
Tobias Thierer
0d35b9fba3 Merge "Revert "Build support for 32-bit armv8-a""
am: 1da1c6d056

Change-Id: I7a5ae22c984ffe8781998b5ae8e20aeb7516fac1
2017-08-22 10:36:35 +00:00
Tobias Thierer
1da1c6d056 Merge "Revert "Build support for 32-bit armv8-a"" 2017-08-22 10:30:29 +00: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
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
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
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
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
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
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
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
Jeff Gaston
12a4b403c2 Merge "Revert "Use the Finder's results for faster searching"" am: 6df0626e58
am: 8467fba043

Change-Id: I81b33819eca94977b72a447db3486293f6b01f11
2017-08-17 20:27:04 +00:00
Jeff Gaston
8467fba043 Merge "Revert "Use the Finder's results for faster searching""
am: 6df0626e58

Change-Id: I93d5c8df8500a5ea99751842b3585708e23fc251
2017-08-17 20:23:35 +00:00
Jeff Gaston
6df0626e58 Merge "Revert "Use the Finder's results for faster searching"" 2017-08-17 20:15:43 +00:00
Jeff Gaston
6f2aea5636 Revert "Use the Finder's results for faster searching"
This reverts commit 4e3ea546d7.

Reason for revert: New Build Breakage: aosp-master/build_test @ 4283735

Change-Id: Icf62c628c1d0cb0b1fd4b401ae1a866f7f88c477
2017-08-17 20:13:08 +00:00
Jeff Gaston
b0839fc05b Merge "Use the Finder's results for faster searching" am: 2d71b221cb am: 1b1997c028
am: 285812156b

Change-Id: I72fc55c1f915ae798fce870c1cdb50a22e9416e3
2017-08-17 19:55:35 +00:00
Jeff Gaston
285812156b Merge "Use the Finder's results for faster searching" am: 2d71b221cb
am: 1b1997c028

Change-Id: I797bf0041f051b34b4160d2ed12a3ea878ce7aca
2017-08-17 19:52:04 +00:00
Jeff Gaston
1b1997c028 Merge "Use the Finder's results for faster searching"
am: 2d71b221cb

Change-Id: I4e78ca9eabeb8259be4a5996d53737719485d9df
2017-08-17 19:48:33 +00:00
Jeff Gaston
2d71b221cb Merge "Use the Finder's results for faster searching" 2017-08-17 19:40:56 +00:00
Colin Cross
4a5458aed1 Fix typo when building aar
I7dced6acbe621a60cd49daf17872941485602732 introduced a typo,
fix (dir $@) to $(dir $@).

Bug: 64634025
Test: m -j on affected target
Change-Id: Ic7181631630662970337c542b73cd0de6f3f995f
2017-08-17 06:44:23 +00:00
Colin Cross
18c92897a7 Merge "Sort files in directories passed to jar" am: 966ed15a1d am: 604a2423b6
am: da54a77928

Change-Id: I5cc539e58d655dbd1730acd368ad98071079a57d
2017-08-17 01:06:44 +00:00
Colin Cross
da54a77928 Merge "Sort files in directories passed to jar" am: 966ed15a1d
am: 604a2423b6

Change-Id: Ib149ee2190cc94af3e9f9934e2aaa23029c3222a
2017-08-17 01:02:45 +00:00
Colin Cross
604a2423b6 Merge "Sort files in directories passed to jar"
am: 966ed15a1d

Change-Id: If01ba7d294e4308a28580b157b9efdb6c860bb35
2017-08-17 01:00:13 +00:00
Treehugger Robot
966ed15a1d Merge "Sort files in directories passed to jar" 2017-08-17 00:48:37 +00:00
Colin Cross
128800f2c8 Sort files in directories passed to jar
jar -C <dir> . produces a jar containing files in filesystem order,
which can vary between builds.  Manually find and sort the list of
files, and convert them into a list of -C <dir> <file> pairs.

Fixes: 64634025
Test: m -j checkbuild
Test: m -j out/target/product/sailfish/system/framework/ext.jar, check
      that entries are sorted
Test: m -j out/target/product/generic_arm64/system/framework/ext.jar on mac
Change-Id: I7dced6acbe621a60cd49daf17872941485602732
2017-08-16 13:37:00 -07:00
Tobias Thierer
345347f527 Merge "Fix log spam in unzip-jar-files" am: 05ecd66557 am: 17f23f3837
am: f161741543

Change-Id: I24ceed9fa2e258a2c1a43bac2d9397862df7cf05
2017-08-16 10:09:12 +00:00
Tobias Thierer
f161741543 Merge "Fix log spam in unzip-jar-files" am: 05ecd66557
am: 17f23f3837

Change-Id: Id49b99ce742c23fb49db0231b3212a7a50c69756
2017-08-16 10:04:15 +00:00
Tobias Thierer
17f23f3837 Merge "Fix log spam in unzip-jar-files"
am: 05ecd66557

Change-Id: I44836b434fabc250ea95dd7f3e5ce3572863be44
2017-08-16 10:00:47 +00:00
Tobias Thierer
05ecd66557 Merge "Fix log spam in unzip-jar-files" 2017-08-16 09:54:46 +00:00
Jason Tholstrup
45e011442a Merge "Updated static_java_library.mk to support proguard options." am: 14e5c5975c -s ours am: fbc9ffd072 -s ours
am: 3faefab6d9  -s ours

Change-Id: I9669ab8df6e668d9d369e3c13b8de2151981cc59
2017-08-16 01:01:04 +00:00
Jason Tholstrup
3faefab6d9 Merge "Updated static_java_library.mk to support proguard options." am: 14e5c5975c -s ours
am: fbc9ffd072  -s ours

Change-Id: I4af4bb010e43df4b72b6cd8de9e33bf6602db8ef
2017-08-16 00:40:10 +00:00
Jason Tholstrup
fbc9ffd072 Merge "Updated static_java_library.mk to support proguard options."
am: 14e5c5975c  -s ours

Change-Id: Ifbde7e8c1638ffc0e43d958715d6939229c8f8ce
2017-08-16 00:30:11 +00:00