Commit Graph

10536 Commits

Author SHA1 Message Date
Jiyong Park
284420700a Merge "Stubs variant is used when building for APEX" am: ce16f3bac8 am: 421ba99ebc
am: d28f1dfcbd

Change-Id: Ief171f81d0f329b7e917cf0fd29ecaaa4c2f528f
2018-12-04 06:43:50 -08:00
Jiyong Park
d28f1dfcbd Merge "Stubs variant is used when building for APEX" am: ce16f3bac8
am: 421ba99ebc

Change-Id: Icbcc08fcb9d075baabac41d25ac8824868e4404f
2018-12-04 06:31:23 -08:00
Jiyong Park
421ba99ebc Merge "Stubs variant is used when building for APEX"
am: ce16f3bac8

Change-Id: I47381a8546586a6a1b7f20158b58c34a0cdf9f2a
2018-12-04 06:21:32 -08:00
Jiyong Park
ce16f3bac8 Merge "Stubs variant is used when building for APEX" 2018-12-04 14:07:56 +00:00
Yi Kong
26a8e315f0 Merge "Revert "Revert "Remove unnecessary warning suppression""" am: 3a33fe535e am: 9d256a5aa1
am: b910379c91

Change-Id: I55f4a983fe7783a43c8b7fc1b2ada3e6e24f7fba
2018-12-04 01:57:17 -08:00
Yi Kong
b910379c91 Merge "Revert "Revert "Remove unnecessary warning suppression""" am: 3a33fe535e
am: 9d256a5aa1

Change-Id: I76bdf7af21564068168fa3cad9b3934f7d6f2bf4
2018-12-04 01:52:57 -08:00
Yi Kong
9d256a5aa1 Merge "Revert "Revert "Remove unnecessary warning suppression"""
am: 3a33fe535e

Change-Id: I81421f5340798c181c7f9b72faea5bc433bc0ed5
2018-12-04 01:47:51 -08:00
Yi Kong
3a33fe535e Merge "Revert "Revert "Remove unnecessary warning suppression""" 2018-12-04 09:30:54 +00:00
Justin Yun
5e8e538574 Merge "VNDK lib must not have product_specific: true" am: 2098eb8c2a am: ec8bf83f9c
am: 2a428940a3

Change-Id: I716613407499459d52c49bca0f9b503fac5d6e1e
2018-12-04 01:10:04 -08:00
Justin Yun
2a428940a3 Merge "VNDK lib must not have product_specific: true" am: 2098eb8c2a
am: ec8bf83f9c

Change-Id: Ic99179293d988bfadd3d25beae81851b6ac315fa
2018-12-04 01:03:55 -08:00
Justin Yun
ec8bf83f9c Merge "VNDK lib must not have product_specific: true"
am: 2098eb8c2a

Change-Id: Iac87ea02330944d0dce438209433186220114c6e
2018-12-04 00:57:43 -08:00
Jiyong Park
25fc6a9cc9 Stubs variant is used when building for APEX
When a native module is built for an APEX and is depending on a native
library having stubs (i.e. stubs.versions property is set), the stubs
variant is used unless the dependent lib is directly included in the
same APEX with the depending module.

Example:

apex {
    name: "myapex",
    native_shared_libs: ["libX", "libY"],
}

cc_library {
    name: "libX",
    shared_libs: ["libY", "libZ"],
}

cc_library {
    name: "libY",
    stubs: { versions: ["1", "2"], },
}

cc_library {
    name: "libZ",
    stubs: { versions: ["1", "2"], },
}

In this case, libX is linking to the impl variant of libY (that provides
private APIs) while libY is linking to the version 2 stubs of libZ. This is
because libY is directly included in the same apex via
native_shared_libs property, but libZ isn't.

Bug: 112672359
Test: apex_test added
Change-Id: If9871b70dc74a06bd828dd4cd1aeebd2e68b837c
2018-12-04 17:46:22 +09:00
Treehugger Robot
2098eb8c2a Merge "VNDK lib must not have product_specific: true" 2018-12-04 08:39:35 +00:00
Dan Willemsen
9ddd1141e2 Merge changes from topic "python_entry_point" am: 990b4b6e7e am: 28ebb18c1c
am: fef4c55072

Change-Id: I6785afcab343af692e3df574139502eb17d826cf
2018-12-03 23:29:07 -08:00
Dan Willemsen
fef4c55072 Merge changes from topic "python_entry_point" am: 990b4b6e7e
am: 28ebb18c1c

Change-Id: I06faa7a69aa274918d05a7b0112b6b92b0c7692f
2018-12-03 23:21:55 -08:00
Dan Willemsen
28ebb18c1c Merge changes from topic "python_entry_point"
am: 990b4b6e7e

Change-Id: I134e9db5cf94e56b0c89244ada34446f5a55beb4
2018-12-03 23:18:02 -08:00
Treehugger Robot
990b4b6e7e Merge changes from topic "python_entry_point"
* changes:
  python par: trim and convert the entry point at build time
  Fix par file zip offsets
2018-12-04 07:11:23 +00:00
Dan Willemsen
ef0e885c24 Merge "Apply system_shared_libs to static libraries" am: 6f3e24ab55 am: 1bd48bd2b2
am: 172e8d3ac0

Change-Id: I8dbb095f3f3231aabf528270bf48edcd3d89fb2a
2018-12-03 22:39:11 -08:00
Dan Willemsen
172e8d3ac0 Merge "Apply system_shared_libs to static libraries" am: 6f3e24ab55
am: 1bd48bd2b2

Change-Id: I1eeb1440f1c2dfc53771ccb13f9a725f2e8005b3
2018-12-03 22:35:08 -08:00
Dan Willemsen
1bd48bd2b2 Merge "Apply system_shared_libs to static libraries"
am: 6f3e24ab55

Change-Id: I67b4841cf66fd01528e542334a28734c6aa0c8dd
2018-12-03 22:30:52 -08:00
Dan Willemsen
6f3e24ab55 Merge "Apply system_shared_libs to static libraries" 2018-12-04 06:19:08 +00:00
Justin Yun
9357f4aeda VNDK lib must not have product_specific: true
VNDK libs are system defined libraries. They must not be product
specific. Adding sanity check and a test to prevent setting
`product_specific: true` on VNDK libs.

Bug: 119575107
Test: building a vndk lib with 'product_specific: true,'
      must return error.

Change-Id: Ie0326540a692573f076ee08baf5d2e2f09d1007e
2018-12-04 14:10:59 +09:00
Yi Kong
734a07c66d Revert "Revert "Remove unnecessary warning suppression""
This reverts commit afedf3bdc9.

Build failure fixed.

Change-Id: I46e7e222c2b5bfa5b1846f3fe87444afb70f1b31
2018-12-04 00:42:27 +00:00
Dan Willemsen
54c5b61f0a python par: trim and convert the entry point at build time
Instead of doing these string operations in the C++ code at every
startup of an embedded par, trim and convert the entry point file to a
python module path at build time.

Test: m
Change-Id: I04a6459a80c84a704b8a25a144ab1e19622d6cc3
2018-12-03 15:58:45 -08:00
Dan Willemsen
263dde779e Fix par file zip offsets
The zip file format does support scripts/programs prefixed to the
archive, though many of the offsets are supposed to start from the
beginning of the file. Some tools (python and zipinfo) are able to
read zip files with arbitrary prefixes, but others (libziparchive and
zipdetails) fail.

So pass the file to prefix onto the zip file into merge_zips so that we
can set the offsets from the real start of the file.

Test: m sepolicy_tests  (runs the embedded python interpreter)
Test: zipinfo out/host/linux-x86/bin/sepolicy_tests
Test: zipdetails out/host/linux-x86/bin/sepolicy_tests
Change-Id: If73d4c2465581f7de5aa47959284ecf2059df091
2018-12-03 15:55:15 -08:00
Dan Willemsen
3a26eefdbe Apply system_shared_libs to static libraries
Even though we aren't doing any linking for static libraries, the
default libraries (libc, libm, libdl) are now exporting headers, so we
should be using those for both static and shared libraries (especially
when re-using objects between the two). Without this we've been in a
state where a cc_library will compile differently than a
cc_library_shared, as we'd re-use the compilation units from the static
variant in the shared library.

This does require marking many of libc's dependencies as not using libc
with system_shared_libs, otherwise we run into dependency loops.

Test: treehugger
Change-Id: Ie42edc5184f315f998db953594e425214b810e0e
2018-12-03 15:38:39 -08:00
Elliott Hughes
9ad490315a Merge "Move setsid(1) to toybox." am: 314d8c142c am: faaa65d89b
am: ba95ed18e4

Change-Id: Id333b6f3ae1979868b1c08c645ca4fc5f39b1619
2018-12-03 15:16:53 -08:00
Evgenii Stepanov
20dab5c71a Merge "Add sanitizer runtime library to recovery when needed." am: 5b46a085d7 am: 792684273d
am: 44ab1d9f09

Change-Id: I23490ab1389d897cf26f9f90c2940469ded4d4ca
2018-12-03 15:07:26 -08:00
Elliott Hughes
ba95ed18e4 Merge "Move setsid(1) to toybox." am: 314d8c142c
am: faaa65d89b

Change-Id: Id77a086e94eb9d1d2f93bff58b25470ebcb2b0df
2018-12-03 14:45:08 -08:00
Evgenii Stepanov
44ab1d9f09 Merge "Add sanitizer runtime library to recovery when needed." am: 5b46a085d7
am: 792684273d

Change-Id: Ie37758e2906bb7ee611d8ff9794850183350ed2a
2018-12-03 14:43:34 -08:00
Elliott Hughes
faaa65d89b Merge "Move setsid(1) to toybox."
am: 314d8c142c

Change-Id: I843298fc4467bd78ea006b1df5be4f6e7767b8e8
2018-12-03 13:58:58 -08:00
Evgenii Stepanov
792684273d Merge "Add sanitizer runtime library to recovery when needed."
am: 5b46a085d7

Change-Id: I7115159d4bd3eb88636699c4164fabe07501554f
2018-12-03 13:53:18 -08:00
Treehugger Robot
314d8c142c Merge "Move setsid(1) to toybox." 2018-12-03 21:49:53 +00:00
Zhizhou Yang
14f162a3e7 Merge "Do not generate SHT_RELR relocations before API 28" am: 89df00c216 am: e74941431e
am: 9759e5e76a

Change-Id: I86833768d148bb1afbf0dc9135cb5d5665cfb058
2018-12-03 13:10:35 -08:00
Treehugger Robot
5b46a085d7 Merge "Add sanitizer runtime library to recovery when needed." 2018-12-03 20:42:37 +00:00
Zhizhou Yang
9759e5e76a Merge "Do not generate SHT_RELR relocations before API 28" am: 89df00c216
am: e74941431e

Change-Id: Ib4b63e48374e239dc71318e1d39c76087ae5d75b
2018-12-03 12:20:17 -08:00
Zhizhou Yang
e74941431e Merge "Do not generate SHT_RELR relocations before API 28"
am: 89df00c216

Change-Id: I76f45bbea868f137906074dfda233ecad02d9caa
2018-12-03 11:27:53 -08:00
Elliott Hughes
e00d040a46 Merge "Move tee(1) to toybox." am: ddefe27f12 am: 577ec82465
am: 98dc0339e0

Change-Id: Icad8e4c347b97749ea8c4d7ebdeeaf49a6623684
2018-12-03 11:06:13 -08:00
Treehugger Robot
89df00c216 Merge "Do not generate SHT_RELR relocations before API 28" 2018-12-03 18:40:59 +00:00
Elliott Hughes
98dc0339e0 Merge "Move tee(1) to toybox." am: ddefe27f12
am: 577ec82465

Change-Id: I6ade5033333cc7be063668ae7031179535b25031
2018-12-03 10:33:18 -08:00
Elliott Hughes
577ec82465 Merge "Move tee(1) to toybox."
am: ddefe27f12

Change-Id: I580e6be3cf671e0137486393cc89fdae2f1b2f59
2018-12-03 10:18:11 -08:00
Elliott Hughes
5728fb536f Move setsid(1) to toybox.
Test: treehugger
Change-Id: I8caf9dbbb671218379c309e698f23e7c964f1a18
2018-12-03 10:14:52 -08:00
Pirama Arumuga Nainar
10021fd7bb Merge "Use libucrt instead of libmsvcr110" am: 7ef2700761 am: 81c3d410fb
am: 7bb60504c5

Change-Id: Ib733084d09c4c2a15cfcdc225880fd5a7e355f4c
2018-12-03 10:10:41 -08:00
Treehugger Robot
ddefe27f12 Merge "Move tee(1) to toybox." 2018-12-03 18:08:32 +00:00
Pirama Arumuga Nainar
7bb60504c5 Merge "Use libucrt instead of libmsvcr110" am: 7ef2700761
am: 81c3d410fb

Change-Id: I6ddca4684065170c788751b6855638b20b077e34
2018-12-03 10:06:53 -08:00
Pirama Arumuga Nainar
81c3d410fb Merge "Use libucrt instead of libmsvcr110"
am: 7ef2700761

Change-Id: I8aedf207323172895f103b4939c3c4170bec096e
2018-12-03 10:01:33 -08:00
Pirama Arumuga Nainar
7ef2700761 Merge "Use libucrt instead of libmsvcr110" 2018-12-03 17:53:43 +00:00
Yi Kong
a7a71847d7 Merge "Revert "Remove unnecessary warning suppression"" am: cf492adb34 am: 1e8681d22f
am: ec10bb5d51

Change-Id: Ief86ddc75dbe998596f2ec8db23cb048fe0ba4c2
2018-11-30 15:52:51 -08:00
Yi Kong
ec10bb5d51 Merge "Revert "Remove unnecessary warning suppression"" am: cf492adb34
am: 1e8681d22f

Change-Id: I2debeb50164d6c5f8d516fe66a6870d34f9dd3eb
2018-11-30 15:47:19 -08:00
Yi Kong
1e8681d22f Merge "Revert "Remove unnecessary warning suppression""
am: cf492adb34

Change-Id: If2941e0eb1a19194bce00af67e5e81aab6368286
2018-11-30 15:42:10 -08:00