Commit graph

16339 commits

Author SHA1 Message Date
Pirama Arumuga Nainar
4c08bad3ff Merge "Pass -static-libgcc to Windows link commands" am: a60e81853f am: 077a726afb
am: 22751cb748

Change-Id: Ic0db7fc84c323b97406968bfb575f6b8f86ce87f
2019-10-15 21:46:37 -07:00
Pirama Arumuga Nainar
22751cb748 Merge "Pass -static-libgcc to Windows link commands" am: a60e81853f
am: 077a726afb

Change-Id: I78f8e5cb49859634987cf3b116869839721dd600
2019-10-15 21:40:39 -07:00
Jiyong Park
805bb2eb23 Merge "add [static|shared].apex_available to cc_library" am: a4cdb8dd40 am: 090366ef0c
am: a98ccc56a4

Change-Id: I5918675d5814f3670e029769c5c6b426ea32368f
2019-10-15 21:40:08 -07:00
Jiyong Park
a98ccc56a4 Merge "add [static|shared].apex_available to cc_library" am: a4cdb8dd40
am: 090366ef0c

Change-Id: I2644a1cb22eaec6486e2c6ab3f3ffa63fce6c9ef
2019-10-15 21:30:04 -07:00
Pirama Arumuga Nainar
077a726afb Merge "Pass -static-libgcc to Windows link commands"
am: a60e81853f

Change-Id: I34dd8c94a262fa993d4bcea02095c70366029b12
2019-10-15 21:29:36 -07:00
Jiyong Park
090366ef0c Merge "add [static|shared].apex_available to cc_library"
am: a4cdb8dd40

Change-Id: I4486cd7d051a3b774bf0c457659c2950121a6ca7
2019-10-15 21:20:59 -07:00
Pirama Arumuga Nainar
a60e81853f Merge "Pass -static-libgcc to Windows link commands" 2019-10-16 03:06:30 +00:00
Treehugger Robot
a4cdb8dd40 Merge "add [static|shared].apex_available to cc_library" 2019-10-16 02:09:44 +00:00
Pirama Arumuga Nainar
105cab2b5a Pass -static-libgcc to Windows link commands
This was unnecessary in the past, when -nodefaultlibs was used while
linking, but that changed with
aosp/I722bd6596a1f3f5819f2767c29c0fa1e8b3ec0e8.

Test: simpleperf_ndk64.exe no longer depends on libgcc_s_seh-1.dll.
Change-Id: I435d7302906eb3758e758b5aefca8763bfba6290
2019-10-15 13:58:30 -07:00
Lev Proleev
c15d800a09 Merge "Add android.hardware.neuralnetworks@1.3" into qt-r1-dev-plus-aosp
am: 5c5e5e31ae

Change-Id: Ic3c22263446217fc35ccd908b5c35b75f451a63e
2019-10-15 11:26:07 -07:00
Lev Proleev
5c5e5e31ae Merge "Add android.hardware.neuralnetworks@1.3" into qt-r1-dev-plus-aosp 2019-10-15 18:08:36 +00:00
Jooyung Han
d8e583287a Merge changes from topic "add-vndk-apex" am: 5ac191f51f am: 5291b25795
am: 03743fafef

Change-Id: I6d6126a3875443d22f9597f980758a0df3c974fa
2019-10-15 10:56:35 -07:00
Jooyung Han
a883c5c77f Supports VNDK APEX with different versions am: 394951da73 am: 2e4c99a684
am: b12a71e6b0

Change-Id: I0f692db1dae117fca7cdfdf81b8186964d574fb3
2019-10-15 10:56:29 -07:00
patricktu
a347dd9be3 Merge "AIDEGen: Remove the duplicate *.srcjar from srcs" am: d90d208628 am: 8c28f4d04f
am: 99f1d25df9

Change-Id: I8411d5b8e5e3981873b29e1880c840fee51aedc0
2019-10-15 10:56:01 -07:00
Inseob Kim
c9668a9cc1 Merge "Add BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW" am: b9326a5b12 am: c16ad617f4
am: 090189da66

Change-Id: Icdbc62120d9fc3090e2190db33f53fa969a094ee
2019-10-15 10:47:18 -07:00
Jooyung Han
03743fafef Merge changes from topic "add-vndk-apex" am: 5ac191f51f
am: 5291b25795

Change-Id: Iae9dc8bfba274296eab66180a237d112392e4d16
2019-10-15 10:35:57 -07:00
Jooyung Han
b12a71e6b0 Supports VNDK APEX with different versions am: 394951da73
am: 2e4c99a684

Change-Id: I660909c791172cd7cb50f4befba8320c5b47d3fd
2019-10-15 10:35:50 -07:00
patricktu
99f1d25df9 Merge "AIDEGen: Remove the duplicate *.srcjar from srcs" am: d90d208628
am: 8c28f4d04f

Change-Id: I11dfca57b045729f6eabf2201a5cf8ca87d7a929
2019-10-15 10:35:18 -07:00
Inseob Kim
090189da66 Merge "Add BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW" am: b9326a5b12
am: c16ad617f4

Change-Id: I6f8d80d3f94bbab70a316d9a55e50700f55f1798
2019-10-15 10:26:28 -07:00
Jooyung Han
5291b25795 Merge changes from topic "add-vndk-apex"
am: 5ac191f51f

Change-Id: Ia76d1fe92132005139b7078a733310ffec5a5617
2019-10-15 02:43:43 -07:00
Jooyung Han
2e4c99a684 Supports VNDK APEX with different versions
am: 394951da73

Change-Id: I198d15b5debeefffaec5dbadd515a119ebcb77d7
2019-10-15 02:43:37 -07:00
Jooyung Han
5ac191f51f Merge changes from topic "add-vndk-apex"
* changes:
  Add __ANDROID_APEX_<NAME>__ for apex variants
  Supports VNDK APEX with different versions
2019-10-15 09:21:19 +00:00
Jiyong Park
a90ca00786 add [static|shared].apex_available to cc_library
apex_available property can be appended differently per the linkage
type. This will be used to restrict certain libs (e.g.
libc_malloc_debug) to an APEX while allowing them to be statically
linkable from platform for testing purpose.

Test: m (apex_test amended)
Change-Id: I6dec23129c5ac93a3ef06fea28f26f240c0ba410
2019-10-15 15:28:07 +09:00
patricktu
8c28f4d04f Merge "AIDEGen: Remove the duplicate *.srcjar from srcs"
am: d90d208628

Change-Id: Id8b2995b3b07d286490fb9da078cb75346690b27
2019-10-14 19:03:08 -07:00
Inseob Kim
c16ad617f4 Merge "Add BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW"
am: b9326a5b12

Change-Id: If2993aa286425ee10ffb3e22e6360bd7e3c0a046
2019-10-14 18:55:24 -07:00
Treehugger Robot
d90d208628 Merge "AIDEGen: Remove the duplicate *.srcjar from srcs" 2019-10-15 01:51:37 +00:00
Inseob Kim
b9326a5b12 Merge "Add BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW" 2019-10-15 01:29:06 +00:00
Inseob Kim
822fdcab1f Add BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW
A new sysprop neverallow rules are mandatory only for devices launching
with R or later. For devices already launched, neverallow rules can be
relaxed with adding following line to BoardConfig.mk:

BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW := true

Bug: 131162102
Test: Set PRODUCT_SHIPPING_API_LEVEL := 30 and try building with
changing some system_public_prop to system_internal_prop
Test: m cts sepolicy_tests

Change-Id: I5e1640f7b43fd47863bc7bd163c2f43b01fa3326
Merged-In: I5e1640f7b43fd47863bc7bd163c2f43b01fa3326
(cherry picked from commit e36f52754f)
2019-10-15 09:22:42 +09:00
Jooyung Han
d29e551efd Add __ANDROID_APEX_<NAME>__ for apex variants
With __ANDROID_APEX_<NAME>__ definition, native modules may have
different behavior when it is built for a specific apex module.

Previously, the name is passed as value of definition __ANDROID_APEX__
like -D__ANDROID_APEX__=com.android.foo. But it is difficult to do
conditional compilation with it.

Now, since the name is incorporated into definition itself, it gets
easier to set #ifdef condition.

Bug: 142582178
Test: m (soong test added)
Change-Id: I3c90c789fa692a19addf2e5a7c8d4cc571cde112
2019-10-15 07:34:02 +09:00
Jooyung Han
394951da73 Supports VNDK APEX with different versions
Older VNDK libraries are provided as vndk_prebuilt_shared modules. Those
are added to corresponding VNDK APEX as dependencies.

With VNDK APEX installed, VNDK libs are unnecessary. By the way, since
there can be vendor modules which depend on VNDK libs, Make targets are
still emitted with UNINSTALLABLE=true.

Android.mk has additional modules for vndk libraries which are named
with apex name as suffices. For example, if libfoo is a vndk library,
then libfoo.vendor is its vendor variant and it would be in
/system/lib/vndk. But with vndk apex, it has additional
libfoo.com.android.vndk.current variant.

Bug: 141451661
Bug: 139772411
Test: m (soong tests)
Test: boot with aosp_arm64 system image on Q vendor device
Change-Id: I269c28a4d4c4e2f1518bd51df558438fe5316774
2019-10-15 07:33:49 +09:00
Paul Duffin
acc6872884 Merge "Add system_modules to droidstubs" am: baf127ce2a am: 01e3863121
am: 4ef7a34f8d

Change-Id: Ib2a023fd2b64f67dc7e71626b5c6d965017e949d
2019-10-14 07:03:07 -07:00
Paul Duffin
4ef7a34f8d Merge "Add system_modules to droidstubs" am: baf127ce2a
am: 01e3863121

Change-Id: I27e125d88b52b47b606ccf3496d842a03431f287
2019-10-14 06:56:04 -07:00
Paul Duffin
01e3863121 Merge "Add system_modules to droidstubs"
am: baf127ce2a

Change-Id: I77dcd480ceb1f68939dd777b1c5f4806c416c2a2
2019-10-14 06:50:39 -07:00
Treehugger Robot
baf127ce2a Merge "Add system_modules to droidstubs" 2019-10-14 13:30:38 +00:00
Anton Hansson
c0af1acf0a Merge "Move odexes of non-system apps into system_other" am: 300a084db6 am: 8c24d37c62
am: 78a626413e

Change-Id: I019112520e73f645063b03471f541488652843db
2019-10-14 02:53:08 -07:00
Anton Hansson
78a626413e Merge "Move odexes of non-system apps into system_other" am: 300a084db6
am: 8c24d37c62

Change-Id: Ic0a4e026afce8a66c258ed197d1a081f19393a64
2019-10-14 02:46:03 -07:00
Anton Hansson
8c24d37c62 Merge "Move odexes of non-system apps into system_other"
am: 300a084db6

Change-Id: Ib460b44a0080eb8aa268c643cba9eca4cf527570
2019-10-14 02:40:43 -07:00
Anton Hansson
300a084db6 Merge "Move odexes of non-system apps into system_other" 2019-10-14 09:29:10 +00:00
patricktu
242faad111 AIDEGen: Remove the duplicate *.srcjar from srcs
AIDEGen collects the complied sources which are generated from build
system, the sources includes not only java/kt files but also srcjar
files. Since the srcjar files are record in srcjars parameter in json
file, we should keep only java or kt files in the srcs parameter.

The size diff of module_bp_java_deps.json:
Without this patch: 15,298,369 Bytes
With this patch: 15,044,804 Bytes

The build time diff:
Without this patch: 2m31.345
With this patch: 2m32.662

Bug: 141528361
Test: 1. m clean -j
      2. aidegen tradefed
      3. Open out/soong/module_bp_java_deps.json
      4. Find the module CtsSyncManagerCommon and check the
         sync_manager_cts.srcjar files doesn't exist in srcs but exists
         in srcjars section.

Change-Id: I43fc5c05b657473054e632cae4795220907dc711
2019-10-14 10:16:17 +08:00
Jiyong Park
295b91b417 Merge "Correctly install APK-in-APEX" am: 8785e55e1c am: 5215b7ec73
am: cfb6e9bc8b

Change-Id: If4c8ebc933f40ff29c35277534a93662ef6148b5
2019-10-13 18:00:01 -07:00
Jiyong Park
cfb6e9bc8b Merge "Correctly install APK-in-APEX" am: 8785e55e1c
am: 5215b7ec73

Change-Id: I2cb4b8c9052b76bbc0d14a191e5001aac25e707d
2019-10-13 17:54:03 -07:00
Jiyong Park
5215b7ec73 Merge "Correctly install APK-in-APEX"
am: 8785e55e1c

Change-Id: I4aba9447e3f32f3eca013051a69c2b808dfec8c5
2019-10-13 17:48:04 -07:00
Treehugger Robot
8785e55e1c Merge "Correctly install APK-in-APEX" 2019-10-14 00:22:33 +00:00
Jaewoong Jung
e5d7ccbd19 Merge "Add go directive to indicate go version number." am: 692a8fd4b6 am: c07cc8a629
am: ee1aa75197

Change-Id: I7a0054ec1d9be304c9f8c1abcc24917726fc0bc8
2019-10-11 12:50:44 -07:00
Jaewoong Jung
ee1aa75197 Merge "Add go directive to indicate go version number." am: 692a8fd4b6
am: c07cc8a629

Change-Id: I5b173ccf9aebd2b641811ffa33db71fb9e6d7226
2019-10-11 12:44:12 -07:00
Jaewoong Jung
c07cc8a629 Merge "Add go directive to indicate go version number."
am: 692a8fd4b6

Change-Id: I300c1402e53e7a0c39271f68bf39487c83de8fca
2019-10-11 12:37:42 -07:00
Treehugger Robot
692a8fd4b6 Merge "Add go directive to indicate go version number." 2019-10-11 19:08:47 +00:00
Jaewoong Jung
5188e23903 Add go directive to indicate go version number.
Test: go vet ./...
Change-Id: I815bec9cba04f6c171f0ef5a3a909c4f5f28f6c2
2019-10-11 09:51:43 -07:00
Jiyong Park
f383f7cfc6 Correctly install APK-in-APEX
APK in a flattened APEX is installed as 'ETC' class module, instead of
the 'APP' class. This is to prevent Make from doing app-specific
amendments (e.g. such as adding module name after my_module_path)
to the paths and filenames which are all correctly set in the Soong
side.

Test: add `installable:true` to development/samples/Snake/Android.mk
and add 'Snake' to the `apps` property of an APEX. The build is
successful.
Test:  build the APEX on a device with TARGET_FLATTEN_APEX=true
The APK is at system/apex/<apexname>/app/Snake/Snake.apk

Bug: 142537672

Change-Id: I314bf1ab7abd4d4a4e9fa210442c004f54d8ccca
2019-10-12 01:06:39 +09:00
Paul Duffin
e25c644f1e Add system_modules to droidstubs
This allows droidstubs to use the same system modules to create the
stubs that will be used to compile them. It improves consistency and
avoids droidstubs having to duplicate the libraries that make up the
system modules on its libs property.

Adds systemModules() to the sdkContext which allows consistent error
checking behavior between droidstubs and java_library.

Bug: 142534789
Test: m checkbuild
Change-Id: Ib2006906d9528a900f16851f50b62152ffb51a1b
2019-10-11 16:38:14 +01:00