Commit graph

9428 commits

Author SHA1 Message Date
Yi Kong
0ea551a11e Merge "Revert "Prevent clang from using the x18 register on arm64."" am: ec2f6cba80
am: 3d317f2b24

Change-Id: Ieb7d9c080e287366f307392108bc2e2b84c10ea8
2018-11-08 17:46:31 -08:00
Yi Kong
3d317f2b24 Merge "Revert "Prevent clang from using the x18 register on arm64.""
am: ec2f6cba80

Change-Id: Iac8612907d9bfd38fc67392483b76233e73317d7
2018-11-08 17:42:26 -08:00
Yi Kong
ec2f6cba80 Merge "Revert "Prevent clang from using the x18 register on arm64."" 2018-11-09 01:32:34 +00:00
Yi Kong
8c3c0f50d0 Revert "Prevent clang from using the x18 register on arm64."
This reverts commit 98d8580c3a.

Change no longer needed with the new LLVM toolchain update.

Bug: 112907825
Bug: 111759196
Change-Id: Ife3ce47a602dd850ac84bb51abc70c0ca157776e
2018-11-08 21:07:08 +00:00
Martin Stjernholm
0ace3376ae Merge "Add shared_libs to vendor and recovery targets." am: c51ffaf1f2
am: fd845abe2a

Change-Id: Idf6fae21d0cd79dfb0976acb3ef3afc75ffae93d
2018-11-08 03:16:29 -08:00
Martin Stjernholm
fd845abe2a Merge "Add shared_libs to vendor and recovery targets."
am: c51ffaf1f2

Change-Id: I4eb5cfd01319c0c6ea86dc64f234a8938578d75d
2018-11-08 03:12:04 -08:00
Martin Stjernholm
c51ffaf1f2 Merge "Add shared_libs to vendor and recovery targets." 2018-11-08 10:55:01 +00:00
Alex Light
ba43629d2b Merge "Use the real compiler for compdb" am: 2eb88c7135
am: ea0c42f2eb

Change-Id: Ib09e91af82bf2e0088dea3e20c27ee364e415775
2018-11-07 18:22:12 -08:00
Alex Light
ea0c42f2eb Merge "Use the real compiler for compdb"
am: 2eb88c7135

Change-Id: I0873f8e0dee87b6dbc0eb92ad685b708bb433fc7
2018-11-07 17:53:59 -08:00
Treehugger Robot
2eb88c7135 Merge "Use the real compiler for compdb" 2018-11-08 01:41:19 +00:00
Alex Light
be96aeac1a Use the real compiler for compdb
Some tools (eg ccls) require that the compiler in argv[0] of the
compdb be an actual compiler binary. Until now we had simply filled
that slot with /bin/false. This change fills it with the current
default clang binary instead.

Test: make -j50 SOONG_GEN_COMPDB=1 SOONG_GEN_COMPDB_DEBUG=1 SOONG_LINK_COMPDB_TO=$ANDROID_BUILD_TOP nothing
Test: Use ccls
Change-Id: I920e8d3113e398b629228070a904dbf1535856e0
2018-11-07 11:35:47 -08:00
Martin Stjernholm
ef449fe62e Add shared_libs to vendor and recovery targets.
Prerequisite for https://android-review.googlesource.com/815573.

Test: Built system/core/libunwindstack with https://android-review.googlesource.com/815573
Bug: 118374951
Change-Id: I6dd7ba1416f34291792c8ac5cf74048753f3e2f6
2018-11-07 11:00:59 +00:00
Yi Kong
e9190f2218 Merge "Update clang to r344140" am: 8a89f21746
am: 0d607467ec

Change-Id: I4c39a764b677667881e301c262f6c5298990d756
2018-11-06 17:52:22 -08:00
Yi Kong
0d607467ec Merge "Update clang to r344140"
am: 8a89f21746

Change-Id: I33b83790907fb82e8cb73370dad587d51f1e504b
2018-11-06 17:48:20 -08:00
Yi Kong
8a89f21746 Merge "Update clang to r344140" 2018-11-07 01:39:56 +00:00
Colin Cross
4c55f5a4a3 Merge "Revert "Use protoc-gen-javalite for java lite protos"" am: a79fe9393a
am: 26a4575e9b

Change-Id: Ic354355cb6023fe7e0bd281abb849f28cb7db505
2018-11-06 11:10:06 -08:00
Colin Cross
26a4575e9b Merge "Revert "Use protoc-gen-javalite for java lite protos""
am: a79fe9393a

Change-Id: Ic6c6cefc9489b9f6a6569575f8411856bf38079f
2018-11-06 10:48:51 -08:00
Colin Cross
a79fe9393a Merge "Revert "Use protoc-gen-javalite for java lite protos"" 2018-11-06 18:42:02 +00:00
Jaewoong Jung
0c1ae15caa Revert "Export static libraries." am: 3affc07ca0
am: ae268e6050

Change-Id: I6b6e056f287985545243d83acf34f1dfa00c17fd
2018-11-06 10:22:46 -08:00
Jaewoong Jung
ae268e6050 Revert "Export static libraries."
am: 3affc07ca0

Change-Id: Iece4468654c0a789f2b86408b1c6ef8d3cfedcea
2018-11-06 10:18:51 -08:00
Jaewoong Jung
3affc07ca0 Revert "Export static libraries."
This reverts commit 9d5ca159dc.

Reason for revert: This broke few builds.

Change-Id: Id9c4d7c145602a55ae07bb177f2c236e16f4fb63
2018-11-06 18:00:39 +00:00
Jaewoong Jung
b835e54415 Export static libraries. am: 9d5ca159dc
am: 212c82513c

Change-Id: I383cad7f8405473e23732ccd361cfe49e40aff1d
2018-11-06 07:29:20 -08:00
Jaewoong Jung
212c82513c Export static libraries.
am: 9d5ca159dc

Change-Id: I1a4ec768e82a53fc609552339789671ec90164d6
2018-11-06 07:20:46 -08:00
Jaewoong Jung
9d5ca159dc Export static libraries.
Export static libraries through LOCAL_STATIC_LIBRARIES and
LOCAL_WHOLE_STATIC_LIBRARIES. This enables dependency-based NOTICE file
generation. Also, add a notice property in the libwinpthread module.

Bug: 36073965
Test: cc_test.go
Change-Id: If1ca1f9159e80cf8fbe71df7a13ca5d6a1f63b40
2018-11-05 23:48:10 +00:00
Roland Levillain
caaa5b275e Merge "Fix ext4 image's root directory permissions of APEX packages." am: 31bef5b329
am: d37b3da5cd

Change-Id: I3567e0cd89dbbf7ee86c93b92d9920776aceaf04
2018-11-05 12:23:29 -08:00
Roland Levillain
d37b3da5cd Merge "Fix ext4 image's root directory permissions of APEX packages."
am: 31bef5b329

Change-Id: Ica210fc34b5257604991d00c1c41e720d0168c97
2018-11-05 12:05:28 -08:00
Roland Levillain
31bef5b329 Merge "Fix ext4 image's root directory permissions of APEX packages." 2018-11-05 19:47:35 +00:00
Colin Cross
c512f0f338 Merge "Use protoc-gen-javalite for java lite protos" am: 87dc8b7138
am: 8c530ca923

Change-Id: I17343626b0fbc2960d3714494484a3ab239bdec4
2018-11-04 17:58:44 -08:00
Colin Cross
8c530ca923 Merge "Use protoc-gen-javalite for java lite protos"
am: 87dc8b7138

Change-Id: Icd251ceeae53d7caf224a2ca365759fa0ec74286
2018-11-04 17:27:57 -08:00
Colin Cross
37a07b1784 Revert "Use protoc-gen-javalite for java lite protos"
This reverts commit 5a5aca0568.

Change-Id: Iadbc2ec7fbc45d888383e0e6f569cbfc5ef6a996
2018-11-04 17:23:48 -08:00
Colin Cross
87dc8b7138 Merge "Use protoc-gen-javalite for java lite protos" 2018-11-05 01:13:14 +00:00
Jiyong Park
e6a4ccb9f2 Merge "Set __<libname>_API__ macro when building against stubs" am: 1a583e7eef
am: a846bd5f97

Change-Id: I5ffe134a36fda08ee2ccafc8744b98b60a11e7d4
2018-11-04 09:09:23 -08:00
Jiyong Park
a846bd5f97 Merge "Set __<libname>_API__ macro when building against stubs"
am: 1a583e7eef

Change-Id: I05d4d003af70ac7dffcadfe5d72c0b89c45f52ab
2018-11-04 09:04:27 -08:00
Treehugger Robot
1a583e7eef Merge "Set __<libname>_API__ macro when building against stubs" 2018-11-04 16:53:33 +00:00
Jiyong Park
da732bd63a Set __<libname>_API__ macro when building against stubs
When building against libFoo#ver, __LIBFOO_API__ macro is set to ver so
that headers from libFoo can be conditionally compiled (e.g., hide APIs
that are not available for the version, etc.)

Bug: 112672359
Test: m (cc_test added)
Change-Id: I863ef95b385cdd842eec1bf34e81f44b5e3b58b3
2018-11-04 13:38:24 +09:00
Jiyong Park
7371caa4b0 Merge "Prebuilt_etc can be uninstallable" am: d8acc14bd2
am: 06742bc42f

Change-Id: I14d92012f5895b129616091163235843bb3dfdc6
2018-11-02 23:49:45 -07:00
Jiyong Park
06742bc42f Merge "Prebuilt_etc can be uninstallable"
am: d8acc14bd2

Change-Id: I962b6d9ed889bfd38c5562cbf711eb4a734e530b
2018-11-02 23:44:42 -07:00
Jiyong Park
d8acc14bd2 Merge "Prebuilt_etc can be uninstallable" 2018-11-03 06:34:23 +00:00
Colin Cross
c143ae0a4e Merge "Include java resources in app bundles" am: 1d7c30a4fc
am: 9da4855cb3

Change-Id: Id7250e50fb4de2027bbc35d9ca2eb3bc8e88d5b1
2018-11-02 22:30:05 -07:00
Colin Cross
9da4855cb3 Merge "Include java resources in app bundles"
am: 1d7c30a4fc

Change-Id: Ic3f020d8f54fc217d00bb93735bf13c881bfb089
2018-11-02 22:26:06 -07:00
Colin Cross
1d7c30a4fc Merge "Include java resources in app bundles" 2018-11-03 05:16:11 +00:00
Colin Cross
5a5aca0568 Use protoc-gen-javalite for java lite protos
Protobuf 3.5.2 does not natively support lite protos, instead they
are generated by the protoc-gen-javalite plugin compiled from
external/protobuf-javalite.

Bug: 117607748
Test: m checkbuild
Change-Id: I95c2d873f19d4c00e9dc312d7fdbe98cae250a8b
2018-11-03 00:05:58 +00:00
Dan Willemsen
f59409fbef Merge "Revert "Export static libraries."" am: 22d7486605
am: 2c0663f741

Change-Id: I760a3596fdb7977930bf151e22174a711602ea6d
2018-11-02 16:20:24 -07:00
Dan Willemsen
2c0663f741 Merge "Revert "Export static libraries.""
am: 22d7486605

Change-Id: I96bd769857841c1ed4d384cab27a52b7c1999731
2018-11-02 16:16:13 -07:00
Dan Willemsen
22d7486605 Merge "Revert "Export static libraries."" 2018-11-02 22:59:09 +00:00
Jaewoong Jung
3e6b1fbcfb Revert "Export static libraries."
This reverts commit 5d19e1de88.

Reason for revert: Broke aosp-build-tools/darwin_mac

Change-Id: I1af36848fb5a00849aec69941ddef33769b1b536
2018-11-02 22:56:30 +00:00
Colin Cross
fd94c40f6f Include java resources in app bundles
The java resources are merged into the dex jar, split them back
out into the root/ directory for merging into the bundle.
Also avoid running zip2zip when dexJarFile is nil by splitting
each munge step out into its own rule.

Bug: 117295826
Test: tapas RecoveryLocalizer && m dist
Change-Id: Ia22c8768bf2c3c6884792e923caf7624b4f76664
2018-11-02 15:51:48 -07:00
Jaewoong Jung
46e6babcbd Merge "Export static libraries." am: fef155c540
am: 458e7b1ab1

Change-Id: Ia530d3b2aaff6d654a0e284a1b9eb8a903a8dd9e
2018-11-02 15:36:25 -07:00
Jaewoong Jung
458e7b1ab1 Merge "Export static libraries."
am: fef155c540

Change-Id: Idd075a7c2424efc2568b70291b43ae7c9f74a3a7
2018-11-02 15:31:21 -07:00
Jaewoong Jung
fef155c540 Merge "Export static libraries." 2018-11-02 22:25:08 +00:00