Dan Willemsen
12fa3d37cc
Merge "Soong now exports AIDL_CPP" am: 06a2daac72 am: f1e23b77f4 am: 66509c37dc
...
am: 1aab680f2f
2016-12-06 02:44:30 +00:00
Dan Willemsen
1aab680f2f
Merge "Soong now exports AIDL_CPP" am: 06a2daac72 am: f1e23b77f4
...
am: 66509c37dc
2016-12-06 02:32:31 +00:00
Dan Willemsen
66509c37dc
Merge "Soong now exports AIDL_CPP" am: 06a2daac72
...
am: f1e23b77f4
2016-12-06 02:28:30 +00:00
Dan Willemsen
f1e23b77f4
Merge "Soong now exports AIDL_CPP"
...
am: 06a2daac72
2016-12-06 02:25:36 +00:00
Treehugger Robot
06a2daac72
Merge "Soong now exports AIDL_CPP"
2016-12-06 02:20:40 +00:00
Dan Willemsen
32b283171e
Soong now exports AIDL_CPP
...
So remove it here.
Test: mmma -j system/tools/aidl
Change-Id: Ia92ce6499881c1aec42900fcfdb4e790a67b62b5
2016-12-05 15:16:38 -08:00
Adrien Schildknecht
0ef3d323d5
Manually merge commit 'c13da91' into stage-aosp-master am: ada51f3b8f am: 13f3b5337a
...
am: f147e615ca
2016-12-03 04:19:54 +00:00
Adrien Schildknecht
f147e615ca
Manually merge commit 'c13da91' into stage-aosp-master am: ada51f3b8f
...
am: 13f3b5337a
2016-12-03 04:15:00 +00:00
Adrien Schildknecht
13f3b5337a
Manually merge commit 'c13da91' into stage-aosp-master
...
am: ada51f3b8f
2016-12-03 04:12:53 +00:00
The Android Automerger
ada51f3b8f
Manually merge commit 'c13da91' into stage-aosp-master
...
* commit 'c13da91':
Add support for creating ext4 images with mke2fs
BUG:33304034
2016-12-03 04:02:09 +00:00
Treehugger Robot
c13da91023
Merge "Add support for creating ext4 images with mke2fs"
2016-12-02 22:48:23 +00:00
Colin Cross
d9aae72d14
Merge "Fix warning with AAPT2 and LOCAL_STATIC_ANDROID_LIBRARIES" am: 1498712a6b am: 51c1eeefb3 am: 04158fac7c
...
am: c2e68615e7
2016-12-02 22:48:02 +00:00
Colin Cross
c2e68615e7
Merge "Fix warning with AAPT2 and LOCAL_STATIC_ANDROID_LIBRARIES" am: 1498712a6b am: 51c1eeefb3
...
am: 04158fac7c
2016-12-02 22:18:27 +00:00
Colin Cross
04158fac7c
Merge "Fix warning with AAPT2 and LOCAL_STATIC_ANDROID_LIBRARIES" am: 1498712a6b
...
am: 51c1eeefb3
2016-12-02 22:09:27 +00:00
Colin Cross
51c1eeefb3
Merge "Fix warning with AAPT2 and LOCAL_STATIC_ANDROID_LIBRARIES"
...
am: 1498712a6b
2016-12-02 22:00:26 +00:00
Colin Cross
1498712a6b
Merge "Fix warning with AAPT2 and LOCAL_STATIC_ANDROID_LIBRARIES"
2016-12-02 21:47:58 +00:00
Paul Duffin
c039e0216f
Merge "Replace core-junit with legacy-test" am: 32cc1f80e5 am: 74f8ee05de am: 29a72d0e22
...
am: ba57775354
2016-12-01 11:00:47 +00:00
Paul Duffin
ba57775354
Merge "Replace core-junit with legacy-test" am: 32cc1f80e5 am: 74f8ee05de
...
am: 29a72d0e22
2016-12-01 10:54:46 +00:00
Paul Duffin
29a72d0e22
Merge "Replace core-junit with legacy-test" am: 32cc1f80e5
...
am: 74f8ee05de
2016-12-01 10:48:46 +00:00
Paul Duffin
74f8ee05de
Merge "Replace core-junit with legacy-test"
...
am: 32cc1f80e5
2016-12-01 10:42:16 +00:00
Rakesh Iyer
1492f7a106
Merge "Updated static_java_library.mk to support proguard options."
2016-11-30 23:04:17 +00:00
Paul Duffin
6470f4fa99
Replace core-junit with legacy-test
...
m -j32 checkbuild cts droid
adb reboot bootloader
fastboot flashall -w
cts-tradefed run cts -m CtsLibcoreTestCases
Bug: 30188076
Test: As above
Change-Id: I2d49cb3c451cb265d026f9a700a61b3fc0d2ed82
2016-11-30 13:50:56 +00:00
Dan Willemsen
2c412e9c92
Prohibit host modules from using LOCAL_COPY_HEADERS am: 6e51ef61a7 am: dc556b4bc0 am: 6e0c0da5dc
...
am: 7dd10c1085
2016-11-29 20:59:13 +00:00
Dan Willemsen
a45af9e63c
Add basic VNDK support in Make am: bab0fa6928 am: 323efd3035 am: 2e300cdb70
...
am: f987fa38a2
2016-11-29 20:59:06 +00:00
Dan Willemsen
be6152d51a
Remove GLOBAL_LD_DIRS am: e5836c4bb0 am: 28cf7d49ab am: 4d20d14143
...
am: 0351f5c988
2016-11-29 20:58:58 +00:00
Dan Willemsen
7dd10c1085
Prohibit host modules from using LOCAL_COPY_HEADERS am: 6e51ef61a7 am: dc556b4bc0
...
am: 6e0c0da5dc
2016-11-29 20:53:41 +00:00
Dan Willemsen
f987fa38a2
Add basic VNDK support in Make am: bab0fa6928 am: 323efd3035
...
am: 2e300cdb70
2016-11-29 20:53:34 +00:00
Dan Willemsen
0351f5c988
Remove GLOBAL_LD_DIRS am: e5836c4bb0 am: 28cf7d49ab
...
am: 4d20d14143
2016-11-29 20:53:27 +00:00
Dan Willemsen
6e0c0da5dc
Prohibit host modules from using LOCAL_COPY_HEADERS am: 6e51ef61a7
...
am: dc556b4bc0
2016-11-29 20:47:40 +00:00
Dan Willemsen
2e300cdb70
Add basic VNDK support in Make am: bab0fa6928
...
am: 323efd3035
2016-11-29 20:47:33 +00:00
Dan Willemsen
4d20d14143
Remove GLOBAL_LD_DIRS am: e5836c4bb0
...
am: 28cf7d49ab
2016-11-29 20:47:27 +00:00
Dan Willemsen
dc556b4bc0
Prohibit host modules from using LOCAL_COPY_HEADERS
...
am: 6e51ef61a7
2016-11-29 20:42:37 +00:00
Dan Willemsen
323efd3035
Add basic VNDK support in Make
...
am: bab0fa6928
2016-11-29 20:42:32 +00:00
Dan Willemsen
28cf7d49ab
Remove GLOBAL_LD_DIRS
...
am: e5836c4bb0
2016-11-29 20:42:26 +00:00
Colin Cross
fe10963496
Fix warning with AAPT2 and LOCAL_STATIC_ANDROID_LIBRARIES
...
Building with LOCAL_STATIC_ANDROID_LIBARIES and LOCAL_USE_APPT2
causes a warning:
build/core/package_internal.mk:143: Empty argument supplied to find-subdir-assets
Only call find-subdir-assets if my_res_dir is not empty.
Also improve the warning message to make it easier to find the module
that caused it.
Test: m -j
Change-Id: I9a71162c7e2ed82f64d6844baca256968ac77317
2016-11-29 11:12:56 -08:00
Adam Seaton
63c8e1ea9d
Updating Security String to 2017-01-05 on nyc-dev am: 190129bc61 am: b9085822a5 am: 091dea5c83
...
am: 223b79e356
2016-11-28 22:17:27 +00:00
Adam Seaton
0d0a1221d0
Updating Security String to 2017-01-01 on nyc-dev am: 202380f93e am: 6108f21d36 am: 6a954bbdbc
...
am: 2e5e286112
2016-11-28 22:17:21 +00:00
Dan Willemsen
6e51ef61a7
Prohibit host modules from using LOCAL_COPY_HEADERS
...
There are no users left, so remove all of this.
Test: lunch aosp_arm-eng; m -j native
Test: build/tools/kati_all_products.sh on aosp and internal master
Change-Id: I32f5c8b470a43dd203d7e20c192167630e4e6888
2016-11-28 13:46:17 -08:00
Dan Willemsen
bab0fa6928
Add basic VNDK support in Make
...
Add BOARD_VNDK_VERSION and LOCAL_USE_VNDK to specify the version of the
VNDK that will be used globally, and whether to use the VNDK on a module
basis.
If the board is using the VNDK:
* LOCAL_COPY_HEADERS may only be used by modules defining LOCAL_USE_VNDK
* LOCAL_USE_VNDK modules will compile against the NDK headers and stub
libraries, but continue to use the platform libc++.
* LOCAL_USE_VNDK modules will not have the global includes like
system/core/include, but it will use device-specific kernel headers.
This change does not attempt to enforce any linking constraints, that
will come in a later patch.
Test: out/build-aosp_arm.ninja is identical before/after
Change-Id: Icce65d4974f085093d500b5b2516983788fe2905
2016-11-28 13:46:17 -08:00
Dan Willemsen
e5836c4bb0
Remove GLOBAL_LD_DIRS
...
The last user of this was the NDK, which has been using full paths in
binary.mk. So remove it.
Test: lunch aosp_arm-eng; m -j native
Change-Id: Ida2523a2d19131ee3ef005edb3e5bcf830710b11
2016-11-28 13:46:17 -08:00
Tao Bao
cc6294669b
Makefile: Pack verity_verifier into otatools.zip. am: 7f02f3413b am: 3b35352e1b am: 24ed10c0cb
...
am: 34c5e69b27
2016-11-28 18:26:14 +00:00
Tao Bao
34c5e69b27
Makefile: Pack verity_verifier into otatools.zip. am: 7f02f3413b am: 3b35352e1b
...
am: 24ed10c0cb
2016-11-28 18:22:14 +00:00
Tao Bao
24ed10c0cb
Makefile: Pack verity_verifier into otatools.zip. am: 7f02f3413b
...
am: 3b35352e1b
2016-11-28 18:17:42 +00:00
Tao Bao
3b35352e1b
Makefile: Pack verity_verifier into otatools.zip.
...
am: 7f02f3413b
2016-11-28 18:13:43 +00:00
Tao Bao
31543713fc
Merge "Makefile: Pack verity_verifier into otatools.zip."
2016-11-28 18:04:04 +00:00
Ian Pedowitz
85ad682924
resolve merge conflicts of 6ff975b to master
...
Test: None (comment only change)
Change-Id: Ib1d948eb7bf9a9638d1989da82a8a3c5c885b5c4
2016-11-23 17:22:06 -08:00
Ian Pedowitz
6ff975bc3c
Adding in some documentation to ensure files are updated as needed
...
am: fc0189fec2
2016-11-24 01:13:14 +00:00
Ian Pedowitz
fc0189fec2
Adding in some documentation to ensure files are updated as needed
...
Also pulls forward the comments added in 9a3d92f719
2016-11-23 14:55:20 -08:00
Tao Bao
7f02f3413b
Makefile: Pack verity_verifier into otatools.zip.
...
verity_verifier is needed when verifying verity metadata.
Bug: 32173582
Test: `m otatools-package`
Change-Id: I63fdeb75cdca10ea38c1df978d64701acdd4c1db
2016-11-22 15:36:57 -08:00
Adrien Schildknecht
9a072cc0b0
Add support for creating ext4 images with mke2fs
...
We are investigating replacing make_ext4fs with the upstream tool mke2fs.
To mitigate the trouble that may arise if the new tool behave differently
compared to the old one, there will be a transition period.
Devices that want to use the new way of creating ext4 images can set the
variable "TARGET_USES_MKE2FS" to true in their BoardConfig.mk
By default, the build system will choose the old tool 'make_ext4fs'.
Test: m otapackage with TARGET_USES_MKE2FS={,false,true}
Change-Id: I282bcb9efe335a86c53986283090ca947d65c7f8
2016-11-18 17:06:29 -08:00
