Zach Jang
12db224269
resolve merge conflicts of 24cfbfa to lmp-dev
...
Change-Id: I5a634582647d154238c5d5bc07ccf1d0fa869132
2016-06-21 18:13:17 -07:00
Guang Zhu
c8e8f38faa
Merge \"move test artifact build rules into open source location\"
...
am: 59e060e1c6
2016-06-22 00:52:30 +00:00
Zach Jang
24cfbfabb7
Updating security string to 2016-08-05 am: 5b14c1f7ce
...
am: 26acdf0c13
2016-06-22 00:44:33 +00:00
Zach Jang
26acdf0c13
Updating security string to 2016-08-05
...
am: 5b14c1f7ce
2016-06-22 00:41:51 +00:00
Guang Zhu
a9bc78af69
move test artifact build rules into open source location
...
Bug: 29404304
Change-Id: I5553d275fe478fac0d6fe00a931a1c1f1e3bdd59
(cherry picked from commit 8322be7252
2016-06-21 15:49:09 -07:00
Dan Willemsen
a988de3baa
Merge \\"Clean up vendor image handling\\" am: 4f807026e2
...
am: edc6ed7aa0
2016-06-21 22:03:30 +00:00
Dan Willemsen
edc6ed7aa0
Merge \"Clean up vendor image handling\"
...
am: 4f807026e2
2016-06-21 22:00:21 +00:00
Dan Willemsen
4f807026e2
Merge "Clean up vendor image handling"
2016-06-21 21:54:40 +00:00
Guang Zhu
8322be7252
move test artifact build rules into open source location
...
Bug: 29404304
Change-Id: I5553d275fe478fac0d6fe00a931a1c1f1e3bdd59
2016-06-20 22:32:16 -07:00
Zach Jang
5b14c1f7ce
Updating security string to 2016-08-05
...
b/29513589
Change-Id: I5ab4a0aa9d26a95dd0e85d87dcc487867b3f284b
2016-06-20 14:30:52 -07:00
Joe Onorato
b7fd3d212b
Also turn down the logging for dex2oat on the boot image
...
Bug: 27499257
Change-Id: I190ce72b44e49451dab44902e2ca33dd5c2815ce
(cherry picked from commit 632db649fb
2016-06-20 11:15:31 -07:00
Dan Willemsen
6c3e79b8e3
Clean up vendor image handling
...
Standardize symlinking /system/vendor -> /vendor for aosp_* devices,
since some /vendor binaries still use /system/vendor/... paths.
Support using a prebuilt vendor image and including it into all the
normal packaging steps.
Bug: 28987532
Change-Id: I27040e8a8d1df0777e16cd1e3c3a9f1b28695e96
2016-06-18 17:47:12 -07:00
Mohamad Ayyash
3336f9ae67
Merge \"squashfs: make disable-4k-align a parameter\" into nyc-dev
...
am: 8ebbc4e7e2
2016-06-16 16:39:39 +00:00
Mohamad Ayyash
8ebbc4e7e2
Merge "squashfs: make disable-4k-align a parameter" into nyc-dev
2016-06-16 16:24:34 +00:00
Dan Willemsen
5da565a85a
Merge changes Ib6ffcc38,Ia58e6bc1
...
am: 3068a85962
2016-06-16 15:50:46 +00:00
Dan Willemsen
b097fbed0a
Check that NDK-built modules only link to NDK-built modules
...
Modules built against the NDK should only link against modules also
built against the NDK (or link to the NDK prebuilts). This patch
attempts to catch these cases, and prints a large warning when this is
violated. Once the tree is cleaned up, this will change to an error.
Change-Id: Ib6ffcc38d9161abdbe45a58af26ba429fb6f1876
2016-06-15 20:22:19 -07:00
Dan Willemsen
dd5a5d328b
Add macros for printing pretty warnings/errors in rules
...
Change-Id: Ia58e6bc1328c84e5f4ba1f6a2fd2d650e94e127e
2016-06-15 20:22:19 -07:00
Mohamad Ayyash
1b6d3485fc
squashfs: make disable-4k-align a parameter
...
BUG: 29388879
Change-Id: I121d2b76db5fb269e2f7152abb2e78098437a0d5
Signed-off-by: Mohamad Ayyash <mkayyash@google.com >
2016-06-15 16:37:21 -07:00
Dan Willemsen
cf771ed98f
Merge \"Fix kati --no_ignore_dirty usage\"
...
am: a6f510c776
2016-06-15 22:55:02 +00:00
Dan Willemsen
3cd95c708d
Merge \"Forbid libstdc++ on Linux and Darwin\"
...
am: 7fba3347b9
2016-06-15 22:54:59 +00:00
Treehugger Robot
a6f510c776
Merge "Fix kati --no_ignore_dirty usage"
2016-06-15 22:41:32 +00:00
Dan Willemsen
3773b45c3b
Fix kati --no_ignore_dirty usage
...
Kati only supports a single use of --no_ignore_dirty, so we were
ignoring the SOONG_ANDROID_MK file, and only detecting changes to
SOONG_MAKEVARS_MK. Fix this by using a pattern that should apply to both
of those makefiles.
Change-Id: I46390f9887f95f1db0efe4e93339667f35ebc67c
2016-06-15 14:55:58 -07:00
Dan Willemsen
327fa9c411
Forbid libstdc++ on Linux and Darwin
...
The last user has been removed, forbid any modules from selecting this.
Change-Id: Idd9ef6ca4b6c6754935d59c4a09c7d213ae481c1
2016-06-15 13:41:45 -07:00
Dan Willemsen
ffb643e487
Merge \"Use more prebuilt build-tools\"
...
am: 6c0c720389
2016-06-14 22:28:02 +00:00
Dan Willemsen
7c2d228701
Use more prebuilt build-tools
...
For acp, we've been using an old prebuilt in prebuilts/sdk, but it's not
part of the SDK. Instead, we'll use a prebuilt in the build-tools
repository.
For ijar, we've been using the host libstdc++ to workaround the lack of
libc++ on some unbundled branches. Instead, use a prebuilt that can use
libc++.
For ziptime, we've been disabling it on unbundled branches, due to the
lack of libc++. Instead, use a prebuilt version of ziptime that can use
the prebuilt libc++.
Change-Id: If80f845ea06f76e3fe6765964e77c864eaf303d0
2016-06-14 13:50:38 -07:00
Jeff Hao
7d49d21ac5
Skip uses-library check for preopted apps.
...
am: b00263f96a
2016-06-14 02:15:53 +00:00
Yabin Cui
494c2b5ebc
Merge \\"Add option to link static lite protobuf library.\\" am: e6fae50455
...
am: bebdc16a68
2016-06-14 01:24:05 +00:00
Jeff Hao
00b75bc41a
Skip uses-library check for preopted apps.
...
Bug: 26880306
(cherry-picked from commit b00263f96a
2016-06-13 18:14:27 -07:00
Jeff Hao
b00263f96a
Skip uses-library check for preopted apps.
...
Bug: 26880306
Change-Id: I97c75cceca30624b5f0c984a5032fdfaf632a90a
2016-06-13 17:32:06 -07:00
Yabin Cui
bebdc16a68
Merge \"Add option to link static lite protobuf library.\"
...
am: e6fae50455
2016-06-14 00:25:05 +00:00
Yabin Cui
e6fae50455
Merge "Add option to link static lite protobuf library."
2016-06-14 00:16:34 +00:00
David Zeuthen
a787117cc5
Merge \\"bvb: Update path to key since repo was moved.\\" am: 8b3b1727da
...
am: 8ab7487660
2016-06-13 16:06:54 +00:00
David Zeuthen
8ab7487660
Merge \"bvb: Update path to key since repo was moved.\"
...
am: 8b3b1727da
2016-06-13 16:03:11 +00:00
David Zeuthen
bca24302bb
bvb: Update path to key since repo was moved.
...
We recently moved Brillo verified boot from system/bvb to external/bvb
so update the path accordingly.
TEST=Build with 'BOARD_BVB_ENABLE := true' succeeds.
BUG=29099910
Change-Id: I66f3b90e23d6b2afc09f81af571ede7b573325e9
2016-06-13 11:26:26 -04:00
Yohann Roussel
9530d9131c
Merge \\"Do not force turn off of Jack warning\\" am: 0a26fc0ace
...
am: 5185323de9
2016-06-13 14:48:53 +00:00
Yohann Roussel
5185323de9
Merge \"Do not force turn off of Jack warning\"
...
am: 0a26fc0ace
2016-06-13 14:44:56 +00:00
Yohann Roussel
0a26fc0ace
Merge "Do not force turn off of Jack warning"
2016-06-13 14:33:48 +00:00
Vikas Marwaha
98dce87fe1
resolve merge conflicts of 07886f1 to nyc-dev-plus-aosp
...
Change-Id: Iae0444b9e9e7b4db3bfd94f5712e22aa08a122b5
2016-06-09 05:46:40 +00:00
Vikas Marwaha
07886f17af
Merge \"Add variable PRODUCT_SHIPPING_API_LEVEL and make files with the new read only product property ro.product.first_api_level.\"
...
am: e5c1af2dd0
2016-06-09 02:38:50 +00:00
Vikas Marwaha
e5c1af2dd0
Merge "Add variable PRODUCT_SHIPPING_API_LEVEL and make files with the new read only product property ro.product.first_api_level."
2016-06-09 02:30:57 +00:00
Dan Willemsen
74da7c9272
Merge \\"Rewrite LDLIBS and SHARED_LIBRARIES\\" am: a8d13592ac
...
am: d8210177af
2016-06-08 21:17:05 +00:00
Dan Willemsen
d8210177af
Merge \"Rewrite LDLIBS and SHARED_LIBRARIES\"
...
am: a8d13592ac
2016-06-08 21:14:36 +00:00
Yohann Roussel
bf17172521
Do not force turn off of Jack warning
...
When ANDROID_JACK_EXTRA_ARGS is defined there is no reason to still turn
off those warnings.
Change-Id: Ic7ac02c72ed3b7b0eaca9394c9fc7d92d5dfa871
2016-06-08 17:00:09 +02:00
Dan Willemsen
6731b495ca
Rewrite LDLIBS and SHARED_LIBRARIES
...
LOCAL_LDLIBS was the only correct way to use NDK libraries, but few used
it correctly. It also often got confused with LOCAL_LDFLAGS, so move the
flags to the correct variable.
For binaries that weren't using the NDK (empty LOCAL_SDK_VERSION), it
was never valid to use LOCAL_LDLIBS, as dependencies would not be
properly set up, and could lead to random build failures. So convert any
-l linker flags to using LOCAL_SHARED_LIBRARIES automatically.
For binaries built using the NDK (LOCAL_SDK_VERSION set), they were
required to use LOCAL_LDLIBS for prebuilt NDK libraries, otherwise they
would get headers and dependencies to the platform versions. Any
non-prebuilt LOCAL_LDLIBS would miss dependencies. So move the NDK
prebuilt libraries to LDLIBS from SHARED_LIBRARIES, and move everything
else to SHARED_LIBRARIES.
So now, for device modules, LOCAL_SHARED_LIBRARIES should always be
used, and we'll do the right thing. LOCAL_LDLIBS should only be used for
host libraries from the system.
Change-Id: Ide34c7afdcfb6507a378d45a42471729e489a9e0
2016-06-07 21:59:55 -07:00
Yabin Cui
72a1156efb
Add option to link static lite protobuf library.
...
Bug: 28114205
Change-Id: Id2b7e42017a53138c60b92de8d196ca92bc38053
2016-06-07 21:24:06 -07:00
Ian Pedowitz
222ab7d2dd
Merge \"Removing N from PLATFORM_VERSION_ALL_CODENAMES\" into nyc-dev
...
am: ddc0c5e0a0
2016-06-08 03:09:44 +00:00
Ian Pedowitz
ddc0c5e0a0
Merge "Removing N from PLATFORM_VERSION_ALL_CODENAMES" into nyc-dev
2016-06-08 03:05:40 +00:00
Gustav Sennton
1a37df5ea1
Merge "Add variable PRODUCT_SHIPPING_API_LEVEL." into nyc-dev
...
am: 837b86aa56
2016-06-07 16:32:33 +00:00
Gustav Sennton
837b86aa56
Merge "Add variable PRODUCT_SHIPPING_API_LEVEL." into nyc-dev
2016-06-07 16:21:16 +00:00
Dan Willemsen
32b36a8819
Merge "Add NATIVE_TESTS class, move host native tests" am: e72fc63901
...
am: 10461b78f0
2016-06-07 00:09:39 +00:00
