Simran Basi
59f7bfe4c3
Merge "base_rules.mk: Don't use is_native for MULTILIB modules." am: 8d3fde909e
...
am: cd81373d91
Change-Id: I962fee1551a3a3e6d8ecc265525c27308397ea7f
2018-01-09 05:32:30 +00:00
Simran Basi
cd81373d91
Merge "base_rules.mk: Don't use is_native for MULTILIB modules."
...
am: 8d3fde909e
Change-Id: Iffa671757256856d2ce39d9fbabfaf217b504f21
2018-01-09 05:11:00 +00:00
Dan Willemsen
179982709b
Merge "Remove armv5te" am: 139f458ced
...
am: 1211033f98
Change-Id: I831c073913e0ba75882130fd6d81e1c786e3af75
2018-01-09 05:09:26 +00:00
Dan Albert
03ac235e79
Merge "Fix allowed STL types for system libraries." am: 48e41b74f9
...
am: f125a492e7
Change-Id: Ifc6a50e9f209cf15d001438889b9129275d771e9
2018-01-09 05:07:06 +00:00
Treehugger Robot
8d3fde909e
Merge "base_rules.mk: Don't use is_native for MULTILIB modules."
2018-01-09 05:05:30 +00:00
Dan Willemsen
1211033f98
Merge "Remove armv5te"
...
am: 139f458ced
Change-Id: I0879425c32e5af7e7d2b72fa4b780d9b394cdc1b
2018-01-09 03:27:48 +00:00
Treehugger Robot
139f458ced
Merge "Remove armv5te"
2018-01-09 03:18:34 +00:00
Dan Albert
f125a492e7
Merge "Fix allowed STL types for system libraries."
...
am: 48e41b74f9
Change-Id: I96bafdc15ff33f554bb14be73a69e7f670369b46
2018-01-09 02:42:24 +00:00
Treehugger Robot
48e41b74f9
Merge "Fix allowed STL types for system libraries."
2018-01-09 02:38:05 +00:00
Elliott Hughes
001396ba85
Merge "adbs was broken for a year and no-one noticed." am: 5a436f10e5
...
am: 260b272319
Change-Id: Idcd7ebfda2f5b5351fee06762096004e322321ce
2018-01-09 00:54:43 +00:00
Elliott Hughes
260b272319
Merge "adbs was broken for a year and no-one noticed."
...
am: 5a436f10e5
Change-Id: I06cf3e97589ee880ef52279335ae546ffa90fc3d
2018-01-08 23:57:18 +00:00
Treehugger Robot
5a436f10e5
Merge "adbs was broken for a year and no-one noticed."
2018-01-08 23:51:24 +00:00
Dan Willemsen
dd3a27394f
Remove armv5te
...
This architecture only existed for unbundled use, but even the NDK is
removing support in their r17 release, so just remove support for it.
Test: build/soong/build_test.bash -only-config
Test: check buildserver configs, I don't see anything still using armv5
Change-Id: Ic183b510c9ada94438bd4cc2b9362fa438a29ced
2018-01-08 15:26:16 -08:00
Elliott Hughes
1a701d93f9
adbs was broken for a year and no-one noticed.
...
Time to remove it.
Bug: https://b/15270043
Test: N/A
Change-Id: Idb56fc99c213732eca75f81ddd9d7a8a19374b42
2018-01-08 13:55:00 -08:00
Simran Basi
7160b06db9
base_rules.mk: Don't use is_native for MULTILIB modules.
...
Currently we determine if a test artifact has multiple build
outputs by checking if it is NATIVE_TEST, NATIVE_BENCHMARK, or
LOCAL_MULTILIB and declare the module is_native.
This is technically not true therefore let's use a different
variable to determine if we need multiple architecture directories.
Bug: 71554249
Test: make sl4a -j ; Results in an autogenerated empty configuration file.
Change-Id: I17c8f3ef7e1cd502b57e25c71688f12a35a9787d
2018-01-08 13:03:07 -08:00
Dan Albert
1759e2d2f1
Fix allowed STL types for system libraries.
...
Static libraries using the system STL have type
native:ndk:system:none, not native:ndk:system:shared, since no
actually linking takes place. These are still allowed to be linked to
platform modules.
Test: make checkbuild
Bug: None
Change-Id: Ib999bb0f422ec3938daa740fca5681e153d6525a
2018-01-08 12:42:20 -08:00
Yi Kong
d36f66fc17
Merge "Revert "Switch to llvm-ar"" am: 259b2741bb
...
am: 87f90c1151
Change-Id: Ic7b843bbf519b90f91144e9c306e926da6840ef1
2018-01-08 20:42:17 +00:00
Yi Kong
87f90c1151
Merge "Revert "Switch to llvm-ar""
...
am: 259b2741bb
Change-Id: I3ad87b11c408d4c6bfd6475c6e73256783d88f55
2018-01-08 19:58:21 +00:00
Yi Kong
259b2741bb
Merge "Revert "Switch to llvm-ar""
2018-01-08 19:51:19 +00:00
Yi Kong
4f2e033447
Revert "Switch to llvm-ar"
...
This reverts commit 5128702ed3
.
Bug: 71694982
Reason for revert: Broke Mac build
Change-Id: I1044eccf943bae3c99e7527bd13989c70743b3d4
2018-01-08 18:09:54 +00:00
Tao Bao
19fc696154
Merge "releasetools: Add tests for common.ReadApkCerts()." am: e3692095a1
...
am: 05d63dc7b0
Change-Id: I9e849a806db2accc02c26c803f2054382eb18603
2018-01-06 00:59:47 +00:00
Tao Bao
05d63dc7b0
Merge "releasetools: Add tests for common.ReadApkCerts()."
...
am: e3692095a1
Change-Id: Ib98bc33fce7af545c6d915cdff419ed5071ed731
2018-01-06 00:49:21 +00:00
Treehugger Robot
e3692095a1
Merge "releasetools: Add tests for common.ReadApkCerts()."
2018-01-05 23:30:53 +00:00
Yi Kong
9ffc233d47
Merge "Switch to llvm-ar" am: 9e700abdfa
...
am: 39118a9904
Change-Id: Idc06be3efa88d26994cc81aa6c9b43af56d37baf
2018-01-05 23:21:07 +00:00
Dan Albert
ae86c094e8
Merge "Remove support for gnustl." am: 51fb7ac7b3
...
am: b5a2a2396a
Change-Id: I86000cfd1b459fcd551184b928c9b1ac5c73aa4a
2018-01-05 23:19:59 +00:00
Dan Albert
c1b8713a4d
Merge "Also restrict NDK linking by static/shared STL." am: 0b4bf51e49
...
am: 0c1295691a
Change-Id: I73594ca8c7c6e50707fecd21768c3027ac9d8281
2018-01-05 23:19:04 +00:00
Yi Kong
39118a9904
Merge "Switch to llvm-ar"
...
am: 9e700abdfa
Change-Id: I3d993baf488a3dfb05203e3059c874d46aa30cbe
2018-01-05 23:12:48 +00:00
Dan Albert
b5a2a2396a
Merge "Remove support for gnustl."
...
am: 51fb7ac7b3
Change-Id: I785e7607924f518a6403e8547363435aa058526c
2018-01-05 23:12:02 +00:00
Dan Albert
0c1295691a
Merge "Also restrict NDK linking by static/shared STL."
...
am: 0b4bf51e49
Change-Id: If86624b2a067501e50241631ffda7a199a80767e
2018-01-05 23:10:58 +00:00
Yi Kong
9e700abdfa
Merge "Switch to llvm-ar"
2018-01-05 22:54:53 +00:00
Treehugger Robot
51fb7ac7b3
Merge "Remove support for gnustl."
2018-01-05 22:29:31 +00:00
Treehugger Robot
0b4bf51e49
Merge "Also restrict NDK linking by static/shared STL."
2018-01-05 22:14:15 +00:00
Tao Bao
818ddf5e7e
releasetools: Add tests for common.ReadApkCerts().
...
Test: python -m unittest test_common
Test: Run sign_target_files_apks.py on a target with compressed APKs.
Change-Id: I107a8b8f2f0f82e2d1947f14c8a8b3778f633b11
2018-01-05 11:53:55 -08:00
Dan Albert
94f95cf504
Remove support for gnustl.
...
Test: make checkbuild
Bug: None
Change-Id: Iaddd40b32f84395a76efaaa74be38770085617d5
2018-01-05 11:49:43 -08:00
Dan Albert
4297c39e75
Also restrict NDK linking by static/shared STL.
...
Test: make checkbuild
Bug: None
Change-Id: I0eb29ec483c069d1c12f444fd2e94cc6eb320f93
2018-01-05 11:49:43 -08:00
SzuWei Lin
2a1e87c92a
Merge "Correct some GSI settings to board makefile" am: b2e9b2b34f
...
am: c32a3396a9
Change-Id: Id008f877e63bf77192396f706b27c291b5c48cab
2018-01-05 08:26:34 +00:00
SzuWei Lin
c32a3396a9
Merge "Correct some GSI settings to board makefile"
...
am: b2e9b2b34f
Change-Id: Iae5a966f51bc1aeb52413490f78a23e57cc76912
2018-01-05 08:23:34 +00:00
Treehugger Robot
b2e9b2b34f
Merge "Correct some GSI settings to board makefile"
2018-01-05 08:17:44 +00:00
Stephen Hines
5128702ed3
Switch to llvm-ar
...
llvm-ar is required for platform LTO build.
With GNU ar, we used crsPD flags, however 'P' flag is not supported by
llvm-ar. Since none of the platform archive files are built using third
party AR, the 'P' flag should not matter to us. However we've been
relying on one side-effect of 'P', where 'ar foo.a some/path/to/obj.o'
when foo.a already has a file named 'obj.o' will be an append operation,
regardless whether the existing one is the same (ar has no way of
telling the difference). We workaround this by always appending ('q'
flag) for llvm-ar. This may result in larger intermediate archive files
(more duplication) but will not affect the final build result.
Bug: 71618641
Test: m checkbuild
Change-Id: Id96a244cfe49cecfba08cc868dd18934ecb4ff23
2018-01-04 23:50:17 -08:00
Colin Cross
23ab1f1580
Merge changes I9fda7fe3,I0a34b2b4,Ie64a283d am: 96029a1276
...
am: e3d02af57d
Change-Id: Iefd8871754f8aae4ca8de2468d2a3774e7ed76c0
2018-01-05 06:29:55 +00:00
Colin Cross
e3d02af57d
Merge changes I9fda7fe3,I0a34b2b4,Ie64a283d
...
am: 96029a1276
Change-Id: I136f4eea75ef4c02c7d990ccbb3c533dcc9eaded
2018-01-05 06:27:30 +00:00
Colin Cross
96029a1276
Merge changes I9fda7fe3,I0a34b2b4,Ie64a283d
...
* changes:
Clear resource_export_package outside conditionals
Fix adbs after move from build/tools to build/make/tools
Use proguard.jacoco.flags for EMMA_INSTRUMENT_STATIC
2018-01-05 06:22:35 +00:00
Jae Shin
1e9b97e595
Merge changes Ida449978,I8c6953f1 am: 8b759c08ca
...
am: 6d5a2d54ff
Change-Id: Ic7606d7572e7143324a210d56ce641f038d6b815
2018-01-05 01:31:12 +00:00
Jae Shin
6d5a2d54ff
Merge changes Ida449978,I8c6953f1
...
am: 8b759c08ca
Change-Id: Ib373611cdff8753a13f8b8c301bdfac2381b8168
2018-01-05 01:26:41 +00:00
Jae Shin
8b759c08ca
Merge changes Ida449978,I8c6953f1
...
* changes:
Apply snapshot variant to vndk package module name
Additionally package TARGET_2ND_ARCH variants
2018-01-05 01:16:06 +00:00
Justin Yun
22b52db8eb
Merge "BOARD_VNDK_RUNTIME_DISABLE must not be "true" for VNDK snapshot" am: fd3f4570fa
...
am: 4c4976b2d2
Change-Id: Ibedfef2ce641588e883e7bb1bc81929cc2ba2c5a
2018-01-05 00:55:32 +00:00
Justin Yun
4c4976b2d2
Merge "BOARD_VNDK_RUNTIME_DISABLE must not be "true" for VNDK snapshot"
...
am: fd3f4570fa
Change-Id: Ida0e970a53a38f0de7c1d07cf3e5b455160d1a97
2018-01-05 00:50:55 +00:00
Treehugger Robot
fd3f4570fa
Merge "BOARD_VNDK_RUNTIME_DISABLE must not be "true" for VNDK snapshot"
2018-01-05 00:41:47 +00:00
Justin Yun
4dff0c6974
BOARD_VNDK_RUNTIME_DISABLE must not be "true" for VNDK snapshot
...
When generating VNDK snapshot, BOARD_VNDK_RUNTIME_DISABLE must not be
'true' to have correct ld.config.txt file.
Bug: 71349776
Test: lunch aosp_arm64_ab-user; make -j vndk dist
Change-Id: I20b14addb2f4a191134a1a9943e328566ca48424
2018-01-05 09:40:47 +09:00
Dan Albert
dd65db6483
Merge "Restrict NDK link type to matching STLs." am: 167fcc5cc0
...
am: e3f8cac48a
Change-Id: I0a86af3d1a9cbf1ea49e0658f23a8017aa9bce36
2018-01-04 23:57:22 +00:00