eaba5765cc
resolve merge conflicts of 40ef25d7bd to stage-aosp-master
...
am: 0ab6b24e07
2017-09-29 10:07:57 +00:00
2cbb80d5b4
Merge "Update paths for frameworks/base/config" am: e984c78faf
...
am: e3196ada4c
2017-09-29 08:21:21 +00:00
0ab6b24e07
resolve merge conflicts of 40ef25d7bd to stage-aosp-master
...
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I39cf0099b857d38222a81c7be41ec13cebb1fb7a
2017-09-29 15:51:45 +08:00
40ef25d7bd
Merge "Apply vndk_package to generic system image"
2017-09-29 06:35:50 +00:00
e3196ada4c
Merge "Update paths for frameworks/base/config"
...
am: e984c78faf
2017-09-29 00:20:46 +00:00
e984c78faf
Merge "Update paths for frameworks/base/config"
2017-09-28 23:43:46 +00:00
d83a7f1fdb
Update paths for frameworks/base/config
...
Bug: 64259751
Test: make
(cherry picked from commit 37ba2d97df
2017-09-28 17:54:20 +00:00
e5c62213c5
Apply vndk_package to generic system image
...
Add vndk_package into PRODUCT_PACKAGES, which includes
HAL interfaces, VNDK, VNDK-SP and LL-NDK.
Bug: 64654641
Bug: 65614701
Test: build pass
Change-Id: I8d8a02d88604d4287a519b698328a50dc11d819d
2017-09-28 15:26:44 +08:00
657f61bdd7
Merge "Disable jack completely" am: 480ee2e58c
...
am: 56294539dc
2017-09-28 00:45:31 +00:00
56294539dc
Merge "Disable jack completely"
...
am: 480ee2e58c
2017-09-28 00:40:05 +00:00
480ee2e58c
Merge "Disable jack completely"
2017-09-28 00:34:50 +00:00
de4a1fc424
Merge "Add CleanSpec.mk entries for linux -> linux_glibc" am: 9ce6d963f2
...
am: 2e21024c86
2017-09-28 00:06:12 +00:00
2e21024c86
Merge "Add CleanSpec.mk entries for linux -> linux_glibc"
...
am: 9ce6d963f2
2017-09-28 00:02:06 +00:00
9ce6d963f2
Merge "Add CleanSpec.mk entries for linux -> linux_glibc"
2017-09-27 23:57:37 +00:00
74616d7802
Add CleanSpec.mk entries for linux -> linux_glibc
...
Soong renamed intermediate directories from linux_(common|x86|x86_64)...
to linux_glibc_(common|x86|x86_64)..., so remove the old versions to
save space.
Test: Check for old intermediates after applying and running cleanspec
Change-Id: I73ff39014491826224535e1d45c2215669fd19a2
2017-09-27 15:08:27 -07:00
6684528a6d
Disable jack completely
...
Always set ANDROID_COMPILE_WITH_JACK=false.
Bug: 65302138
Test: m -j checkbuild
Change-Id: I98dfdca27b4338048d50e016a79fbf4e3d86a020
2017-09-27 13:17:59 -07:00
6997a8e62e
Merge "Add -lm to the default libs for Linux & Darwin" am: 5118763940
...
am: c8e3f1e0d8
2017-09-27 07:17:23 +00:00
c8e3f1e0d8
Merge "Add -lm to the default libs for Linux & Darwin"
...
am: 5118763940
2017-09-27 07:13:58 +00:00
5118763940
Merge "Add -lm to the default libs for Linux & Darwin"
2017-09-27 07:08:57 +00:00
7dc739a486
Merge "Check available host libraries" am: b643f2caec
...
am: a8fd8de638
2017-09-27 04:00:09 +00:00
a8fd8de638
Merge "Check available host libraries"
...
am: b643f2caec
2017-09-27 03:57:43 +00:00
b643f2caec
Merge "Check available host libraries"
2017-09-27 03:50:45 +00:00
4e38043602
Merge "Switch from jack to javac for unbundled builds" am: 355de0a00d
...
am: a938462068
2017-09-27 03:37:36 +00:00
a938462068
Merge "Switch from jack to javac for unbundled builds"
...
am: 355de0a00d
2017-09-27 03:33:31 +00:00
355de0a00d
Merge "Switch from jack to javac for unbundled builds"
2017-09-27 03:26:13 +00:00
a3a06feeed
Add -lm to the default libs for Linux & Darwin
...
libm is a default library for device builds, so default it for host
builds as well.
Also removes duplicate additions of -ldl, -lpthread, -lm and -lrt.
Test: m host
Change-Id: I6a07e12053090eb6997b79d4091c28ac9a9022de
2017-09-26 20:26:11 -07:00
1e7f83bf49
Merge changes I06179fca,Ie48746c8,Ia47ebc95 am: b182ea7bcb
...
am: 2c717745b2
2017-09-27 02:46:04 +00:00
2c717745b2
Merge changes I06179fca,Ie48746c8,Ia47ebc95
...
am: b182ea7bcb
2017-09-27 02:43:56 +00:00
b182ea7bcb
Merge changes I06179fca,Ie48746c8,Ia47ebc95
...
* changes:
Disable turbine for unbundled builds
Allow disabling turbine
Simplify the *-lib-* functions
2017-09-27 02:36:24 +00:00
5601842176
Disable turbine for unbundled builds
...
We don't yet have a turbine prebuilt, so disable turbine for
unbundled builds for now.
Test: none
Change-Id: I06179fca1764a86e387c8bd154ae052e2669d15b
2017-09-26 17:39:01 -07:00
7dc9043546
Allow disabling turbine
...
m -j TURBINE_ENABLED=false will build without turbine. This is
primarily useful for A/B comparisions of turbine builds, but will
also be used to temporarily disable turbine for unbundled builds
until we have turbine prebuilts.
Bug: 64308460
Test: m -j TURBINE_ENABLED=false java
Test: m -j java
Change-Id: Ie48746c8bfc60c361be9634cb1805ca1c09aa1fe
2017-09-26 16:23:00 -07:00
9b2e4c6950
Simplify the *-lib-* functions
...
Simplify the java-lib-* type functions, three layers of abstraction
is a bit much for a single line function, and isn't reducing enough
duplication to be worth the complexity.
Add app-lib-* functions and use them.
Test: m -j checkbuild
Change-Id: Ia47ebc95e4af2073396233416f14fdee7d856844
2017-09-26 16:23:00 -07:00
73acd38175
Merge "Only define proguard dictionary as output if obfuscating" am: 96a782f1ea
...
am: 13c0785b09
2017-09-26 21:54:10 +00:00
13c0785b09
Merge "Only define proguard dictionary as output if obfuscating"
...
am: 96a782f1ea
2017-09-26 21:52:10 +00:00
96a782f1ea
Merge "Only define proguard dictionary as output if obfuscating"
2017-09-26 21:45:28 +00:00
bdd6a756d1
Only define proguard dictionary as output if obfuscating
...
If we're not obfuscating, proguard doesn't generate the mapping file,
and ninja will consider the edge dirty, since one of the output files
does not exist.
Also disable it for jack, since jack writes to a different file.
Bug: 66929996
Test: m cts; m cts
Test: m ahat-test with a clean build
Change-Id: Iff6707c44cbd86cd9328bbad8322398bc9d960fd
2017-09-26 13:01:49 -07:00
1db082a142
Merge changes I0a1aa003,I000c3c22 am: a4a1f2089b
...
am: e69ccc7fb6
2017-09-26 18:52:17 +00:00
e69ccc7fb6
Merge changes I0a1aa003,I000c3c22
...
am: a4a1f2089b
2017-09-26 18:48:46 +00:00
a4a1f2089b
Merge changes I0a1aa003,I000c3c22
...
* changes:
Use dx or d8 from prebuilts/build-tools
Desugar lambdas in javac unbundled builds
2017-09-26 18:29:22 +00:00
4694617255
Merge "Fix unbundled jack builds" am: fcdbbd0dbf
...
am: b7665ed25c
2017-09-26 09:06:34 +00:00
b7665ed25c
Merge "Fix unbundled jack builds"
...
am: fcdbbd0dbf
2017-09-26 09:02:44 +00:00
fcdbbd0dbf
Merge "Fix unbundled jack builds"
2017-09-26 08:58:21 +00:00
6f2e41dbdf
Merge "Do not remove init.recovery.*.rc in recovery root" am: f184554771
...
am: 4cd430cb3e
2017-09-26 07:35:01 +00:00
4cd430cb3e
Merge "Do not remove init.recovery.*.rc in recovery root"
...
am: f184554771
2017-09-26 07:32:24 +00:00
f184554771
Merge "Do not remove init.recovery.*.rc in recovery root"
2017-09-26 07:26:50 +00:00
4dbb354514
Check available host libraries
...
Soong has a list of allowed host libraries. Check that list for make
modules as well.
Test: build/soong/build_test.bash (Linux&Darwin, aosp&internal)
Test: Add bad library in LOCAL_LDLIBS, ensure it errors
Change-Id: Icc48533487576998b049dc6c704c410172a91521
2017-09-26 00:14:01 -07:00
0a68e5e66f
Fix unbundled jack builds
...
Recent change Icbc8987468f237aa351708b33c3abe5ea3d1816e was
unconditionally adding core-oj and core-libart as the
bootclasspath for all jack compiles, which is incorrect and
was breaking unbundled builds that don't have sources for
core-oj and core-libart. Only add them when LOCAL_SDK_VERSION
is not set.
Test: unbundled build
Change-Id: I6bab7e36e8178384f13cf9df8183a53fcb4b23f8
2017-09-25 23:47:21 -07:00
665dce738a
Merge changes from topic "bootclasspath_default_libs" am: e58881ac38
...
am: df0c2fd298
2017-09-26 01:23:03 +00:00
c70fcc848c
Add dependencies on bootclasspath libraries am: 1d1e5ef61b
...
am: fa4d9fbfdd
2017-09-26 01:22:53 +00:00
3bdb80d27f
Reindent bootclasspath code am: f6bc1a1ac0
...
am: e0f8317395
2017-09-26 01:22:45 +00:00
SzuWei Lin