Commit Graph

7026 Commits

Author SHA1 Message Date
Jiyong Park
d13fe6aaff Link type check for Android.bp defined Java modules am: 2d4929464b
am: fe68fe47cf

Change-Id: Ie3ceb7140f91e7edc5053d132204de88a3f61b46
2018-03-29 22:06:02 +00:00
Jiyong Park
fe68fe47cf Link type check for Android.bp defined Java modules
am: 2d4929464b

Change-Id: Idbddcd0120f84a4f85749fabf7ec062fd02f83fb
2018-03-29 21:51:19 +00:00
Colin Cross
8fe69c9ebe [automerger skipped] Merge "Fix data race on cfiExportsMap" into pi-dev
am: be6b6a63f8  -s ours

Change-Id: Ia42691dc9d422a96ff47f74232c43c4af0b3fd82
2018-03-29 05:09:53 +00:00
TreeHugger Robot
be6b6a63f8 Merge "Fix data race on cfiExportsMap" into pi-dev 2018-03-29 04:52:31 +00:00
Colin Cross
5ec2a238fb Fix data race on cfiExportsMap am: 1218a19f0d
am: a4905aa28c

Change-Id: I23c3bd9466c7d9db3d1a40b759b0d603d43e84a4
2018-03-29 02:21:24 +00:00
Colin Cross
6c0d7bb1ac Fix format string issues am: f46e37f5f7
am: 52d1c14ccd

Change-Id: I9e7ba86614a0add6bca764440e61d9ea5a7a8582
2018-03-29 02:21:18 +00:00
Colin Cross
fe6edc9a70 Fix data race on cfiExportsMap
cfiExportsMap was reinitialized for every module, which caused
data races.  Create the path from the string on each use
instead.

Bug: 77234104
Test: m nothing with race detector turned on
Change-Id: Ibca3149dcbe8a9d4d9f7ec6dd0b164697e7ae5cd
Merged-In: Ibca3149dcbe8a9d4d9f7ec6dd0b164697e7ae5cd
(cherry picked from commit 1218a19f0d)
2018-03-28 19:18:07 -07:00
Colin Cross
a4905aa28c Fix data race on cfiExportsMap
am: 1218a19f0d

Change-Id: I65ae907c7d9234c4384734d7f004c48028d13618
2018-03-29 02:16:20 +00:00
Colin Cross
52d1c14ccd Fix format string issues
am: f46e37f5f7

Change-Id: If0c8fea5687d662bee99903ee333b525aeec416a
2018-03-29 02:16:16 +00:00
Nan Zhang
9a229edd55 [automerger skipped] Merge "Fix the flaky build breakage for droiddoc target." into pi-dev
am: 601ab89103  -s ours

Change-Id: I9d3e7da16de71b81c950e0738b0be39feee3ab26
2018-03-29 00:31:46 +00:00
TreeHugger Robot
601ab89103 Merge "Fix the flaky build breakage for droiddoc target." into pi-dev 2018-03-29 00:00:35 +00:00
Justin Yun
d720c4378a [automerger skipped] Set __ANDROID_API__ for vendor modules to vndk version.
am: 2497d5f9ce  -s ours

Change-Id: I53f81f37c6b181b137cd5c20f958286035b7bf4b
2018-03-28 23:52:09 +00:00
Jiyong Park
2d4929464b Link type check for Android.bp defined Java modules
Link-type is also checked among Java modules defined in Soong. Until
now, the check has been done in between Soong/Make and Make/Make.

With this, a Java module can't depend on another Java module built with
larger API surface. For example, a java library built with Android SDK
(sdk_version: "current") can't link to a library built without SDK.

Bug: 73829976
Test: m -j

Change-Id: I64277be6e65e8535aad951b4f08f8d10b67abe66
Merged-In: I64277be6e65e8535aad951b4f08f8d10b67abe66
(cherry picked from commit f3586661e8)
2018-03-28 16:20:15 -07:00
Colin Cross
1218a19f0d Fix data race on cfiExportsMap
cfiExportsMap was reinitialized for every module, which caused
data races.  Create the path from the string on each use
instead.

Bug: 77234104
Test: m nothing with race detector turned on
Change-Id: Ibca3149dcbe8a9d4d9f7ec6dd0b164697e7ae5cd
2018-03-28 16:19:50 -07:00
Justin Yun
2497d5f9ce Set __ANDROID_API__ for vendor modules to vndk version.
When building vendor modules with BOARD_VNDK_VERSION=current, the
API of the vendor modules will be current PLATFORM_VNDK_VERSION.
__ANDROID_API_FUTURE__ will be used as before if the version is a
CODENAME.

If BOARD_VNDK_VERSION is not "current", that means the VNDK version
of the vendor modules is BOARD_VNDK_VERSION.

Bug: 74833244
Test: Build and check boot.
Change-Id: I383c76a36101e39c70575b463880b52d3e9d90bb
Merged-In: I383c76a36101e39c70575b463880b52d3e9d90bb
(cherry picked from commit 732aa6afdf)
2018-03-28 23:02:41 +00:00
Colin Cross
f46e37f5f7 Fix format string issues
Fix issues caught by go vet.

Test: m checkbuild
Change-Id: Ib8d740457c15432dabe1575a6707726ddaf93084
2018-03-28 15:54:52 -07:00
Jayant Chowdhary
42c0617a71 [automerger skipped] Fix omission of llndk libraries during abi dump creation.
am: 6049368014  -s ours

Change-Id: I1edded0e1c119722bf1d0f74a08826a6ab4fb086
2018-03-28 22:22:28 +00:00
Nan Zhang
2e9f9a2220 Fix the flaky build breakage for droiddoc target.
ExpandSourcesSubDir was calling SourceFileProducer.Srcs(), and then
doing:
moduleSrcs = append(moduleSrcs[:j], moduleSrcs[j+1:]...)
This modifies the backing store of the slice, which may affect the
original data stored in the SourceFileProducer.  Make all Srcs
implementations return slice that points to a copy of the backing
array.

Test: m out/target/common/obj/PACKAGING/checkpublicapi-current-timestamp
Bug: b/76179848 b/76397326
Change-Id: I2432ce196984814daafc5aa9a2746e81de74494c
Merged-In: I2432ce196984814daafc5aa9a2746e81de74494c
(cherry picked from commit e42777a05a)
2018-03-28 14:54:50 -07:00
Alan Viverette
052fc08952 Always include JAR dependencies (not just with --static-deps) in Makefile am: 2b53a0c4b8
am: 08e81f2302

Change-Id: I09ac4011c83a052b8e401cfb802ff3af57fc3388
2018-03-28 21:50:12 +00:00
Alan Viverette
08e81f2302 Always include JAR dependencies (not just with --static-deps) in Makefile
am: 2b53a0c4b8

Change-Id: Idf35bb0849066e806ddf6465a5d2ce9df71ad2dc
2018-03-28 21:38:08 +00:00
Alan Viverette
2b53a0c4b8 Always include JAR dependencies (not just with --static-deps) in Makefile
Bug: 76692459
Test: ./update_current.py -x <build-id>
Change-Id: Ie0f77e52089adbe153d668fe39902545f469f2d2
2018-03-28 14:32:10 -04:00
Jayant Chowdhary
6049368014 Fix omission of llndk libraries during abi dump creation.
We omit vendor unavailable modules. This should not apply to llndk
libraries since currently, we do abi checks on their system variants.

Bug: 77101345

Test: m -j libc creates libc.so.lsdump

Test: m -j libjpeg.vendor creates libjpeg.so.lsdump

Test: m -j external/cblas still does not create libblas.so.lsdump

Merged-In: I5522c1cd471bfba8a1f632270ab2f167b4b17117
Change-Id: I5522c1cd471bfba8a1f632270ab2f167b4b17117
(cherry picked from commit fa920fabda)
2018-03-28 10:10:33 -07:00
Victor Khimenko
95575deee0 Merge "Make arm_on_x86 symmetric" into pi-dev
am: 9c9894febf

Change-Id: I47fa25635465634b735e9134be3865e6850cf6a9
2018-03-28 11:07:10 +00:00
Victor Khimenko
9c9894febf Merge "Make arm_on_x86 symmetric" into pi-dev 2018-03-28 10:58:26 +00:00
Martijn Coenen
31b0158e7c [automerger skipped] Merge "Add trace flag for cpp/Java AIDL generation." into pi-dev
am: 4ed6f97d8f  -s ours

Change-Id: I5edabcc42d3f814e71f448a474e5ea6c3aa7b339
2018-03-28 07:03:42 +00:00
Martijn Coenen
4ed6f97d8f Merge "Add trace flag for cpp/Java AIDL generation." into pi-dev 2018-03-28 06:53:35 +00:00
Nan Zhang
ea4c2971d2 Fix the flaky build breakage for droiddoc target. am: e42777a05a
am: d368414bb4

Change-Id: Ic444461ecf07f7e0637cd9407b3c6a0113da8483
2018-03-28 05:29:47 +00:00
Nan Zhang
d368414bb4 Fix the flaky build breakage for droiddoc target.
am: e42777a05a

Change-Id: Iecdb1161fc8bc6717e16654701a25c5fcccc19d3
2018-03-28 05:25:14 +00:00
Nan Zhang
e42777a05a Fix the flaky build breakage for droiddoc target.
ExpandSourcesSubDir was calling SourceFileProducer.Srcs(), and then
doing:
moduleSrcs = append(moduleSrcs[:j], moduleSrcs[j+1:]...)
This modifies the backing store of the slice, which may affect the
original data stored in the SourceFileProducer.  Make all Srcs
implementations return slice that points to a copy of the backing
array.

Test: m out/target/common/obj/PACKAGING/checkpublicapi-current-timestamp
Bug: b/76179848 b/76397326
Change-Id: I2432ce196984814daafc5aa9a2746e81de74494c
2018-03-28 05:12:15 +00:00
Jayant Chowdhary
06ec9d1e22 Merge "Fix omission of llndk libraries during abi dump creation." am: 215cedde6a
am: 208f567c05

Change-Id: Ie8e99c4eb2e5000f0fa624ff4fb0c94062319536
2018-03-27 23:22:27 +00:00
Jayant Chowdhary
208f567c05 Merge "Fix omission of llndk libraries during abi dump creation."
am: 215cedde6a

Change-Id: Iff9f45e68b3150707ab3a4f24beea225b03cfadc
2018-03-27 23:07:52 +00:00
Treehugger Robot
215cedde6a Merge "Fix omission of llndk libraries during abi dump creation." 2018-03-27 22:48:40 +00:00
Chih-hung Hsieh
cc866d6f32 Merge "Switch to clang 7.0" am: 055fa01693
am: 538ee81f0d

Change-Id: I33fe0f8e56bb554a1539dc624da42e836cf16c79
2018-03-27 18:57:25 +00:00
Chih-hung Hsieh
538ee81f0d Merge "Switch to clang 7.0"
am: 055fa01693

Change-Id: Ic14a560f3f3cb99765dd68aec99b946bc9054907
2018-03-27 18:50:18 +00:00
Chih-hung Hsieh
055fa01693 Merge "Switch to clang 7.0" 2018-03-27 18:38:19 +00:00
Jayant Chowdhary
fa920fabda Fix omission of llndk libraries during abi dump creation.
We omit vendor unavailable modules. This should not apply to llndk
libraries since currently, we do abi checks on their system variants.

Bug: 77101345

Test: m -j libc creates libc.so.lsdump

Test: m -j libjpeg.vendor creates libjpeg.so.lsdump

Test: m -j external/cblas still does not create libblas.so.lsdump

Change-Id: I5522c1cd471bfba8a1f632270ab2f167b4b17117
2018-03-27 11:30:18 -07:00
Victor Khimenko
b11219db87 Make arm_on_x86 symmetric
We only define arm_on_x86 in the x86 code, but sometimes arm code needs
to know that it's working in the emulated mode, too.

Test: CtsRsCppTestCases

Bug: b/75971275

Change-Id: I99564fbe9aeb284e2f11ffb593b18536a7755ea5
(cherry picked from commit 5eb8ec1e72)
2018-03-27 20:06:00 +02:00
Tobias Thierer
aa592d69e7 Merge "javadoc/droidoc: Don't add .jar files to sourcepath." am: ddd0a41379
am: db2434a262

Change-Id: I81b02b4fb65dc94137bd443381c977afda8c79ad
2018-03-27 10:13:59 +00:00
Tobias Thierer
db2434a262 Merge "javadoc/droidoc: Don't add .jar files to sourcepath."
am: ddd0a41379

Change-Id: I7a5cd31a42069baf3a122bf3a3f8e8734f80955b
2018-03-27 10:07:21 +00:00
Tobias Thierer
ddd0a41379 Merge "javadoc/droidoc: Don't add .jar files to sourcepath." 2018-03-27 09:54:13 +00:00
Ryan Prichard
ce8f6b0965 Remove an extraneous space character. am: 05206118dc
am: e293641152

Change-Id: If36f69d1f0b7d7a019c03ee1764a2912e094ffb4
2018-03-27 07:39:27 +00:00
Ryan Prichard
e293641152 Remove an extraneous space character.
am: 05206118dc

Change-Id: I8e21a71f983208ad9faf106af1473eb13318428c
2018-03-27 07:32:26 +00:00
Martijn Coenen
22071ca4b4 Add trace flag for cpp/Java AIDL generation.
The AIDL code generator can now include trace code in every generated
AIDL call. We don't want to enable this by default for all interfaces
for two reasons:
1) Potential performance overhead
2) For Java targets, the code depends on @hide APIs in android.os.Trace,
   and I haven't found a clean way to determine whether a target is
   allowed to use @hide stuff in the SDK. LOCAL_PRIVATE_PLATFORM_APIS
   is almost it, but it's not set for the core framework (which is
   exactly one of the things we'd like to trace).

Bug: 74416314
Test: verify correct code is generated when flag is set
Change-Id: Ic6ab8aee3e708207813da3e803911a844ff3e52b
Merged-In: Ic6ab8aee3e708207813da3e803911a844ff3e52b
2018-03-27 07:22:55 +00:00
Ryan Prichard
05206118dc Remove an extraneous space character.
The space prevents "repo upload" from running on my machine:

    $ repo upload .
    [COMMIT 50e35bea87f0] Use Soong modules for the NDK's extra STL libraries
    [FAILED] gofmt
      FILES: ('cc/cc.go',)    <standard input>
    [FAILED] repohooks for platform/build/soong failed
    FATAL: Preupload failed due to above error(s).
    For more info, please see:
    https://android.googlesource.com/platform/tools/repohooks/

Bug: none
Test: repo upload
Change-Id: I6b5de8f5d4edb38ca26a999e561df10262844b3d
2018-03-27 05:09:37 +00:00
Justin Yun
f0249c882e Set __ANDROID_API__ for vendor modules to vndk version. am: 732aa6afdf
am: e194a56a01

Change-Id: I1093e689f14f029db238bf4a838c0def8493a502
2018-03-27 01:37:27 +00:00
Justin Yun
e194a56a01 Set __ANDROID_API__ for vendor modules to vndk version.
am: 732aa6afdf

Change-Id: I46307083f839553ad474bf30c439fa3a9373e1e5
2018-03-27 01:31:42 +00:00
Chih-Hung Hsieh
3ede294729 Switch to clang 7.0
* Suppress more noisy new warnings at global level.
* Add -no-pie to partial link .o files, with -r.
* Revert workaround of b/72706604, no need of
  -Wl,-plugin-opt,-emulated-tls
* Filter out clang 7.0 unknown flag "-Wno-extended-offsetof"

Bug: 72706604
Bug: 72412006
Test: make checkbuild
Change-Id: I7ff45465c4bd771991f42b40f68dc35586045656
2018-03-26 18:04:47 -07:00
Rajeev Kumar
6f80dfd857 Merge "Add product_variables.Use_lmkd_stats_log." into pi-dev
am: f65a99cee1

Change-Id: I235eb051a60b01039f4ee2b3dcb41802fa81b797
2018-03-26 23:33:53 +00:00
Tobias Thierer
c9e360ac8a javadoc/droidoc: Don't add .jar files to sourcepath.
javadoc expects directories on the sourcepath, not jar files.
The original commit 88b607994a148f4af5bffee163e39ce8296750c6
in 2009 was already passing the jar files, and every revision
since then seems to have kept this habit through cargo cult.

This CL removes the superfluous jar file arguments from the
sourcepath argument to javadoc.

Test: Treehugger
Bug: 76436487

Change-Id: I3a8503ae089cd6657a698c0552dc194156311849
2018-03-27 00:33:05 +01:00
Justin Yun
732aa6afdf Set __ANDROID_API__ for vendor modules to vndk version.
When building vendor modules with BOARD_VNDK_VERSION=current, the
API of the vendor modules will be current PLATFORM_VNDK_VERSION.
__ANDROID_API_FUTURE__ will be used as before if the version is a
CODENAME.

If BOARD_VNDK_VERSION is not "current", that means the VNDK version
of the vendor modules is BOARD_VNDK_VERSION.

Bug: 74833244
Test: Build and check boot.
Change-Id: I383c76a36101e39c70575b463880b52d3e9d90bb
2018-03-27 08:21:19 +09:00