Commit graph

7287 commits

Author SHA1 Message Date
Alan Viverette
d95159cb33 Always include JAR dependencies (not just with --static-deps) in Makefile
Bug: 76692459
Test: ./update_current.py -x <build-id>
Change-Id: Ie0f77e52089adbe153d668fe39902545f469f2d2
Merged-In: Ie0f77e52089adbe153d668fe39902545f469f2d2
2018-04-06 13:20:44 -04:00
Kweku Adams
74f58c4849 Merge "Fixing protoOutParams concatenation." am: eacf1a6e85
am: e819d2b345

Change-Id: I8969a5bf4532c4f71fc353f326b83bf1c563194e
2018-04-06 10:05:45 -07:00
Kweku Adams
e819d2b345 Merge "Fixing protoOutParams concatenation."
am: eacf1a6e85

Change-Id: Iac5729bd16b484946de389fa9ce84f8cfe793ddd
2018-04-06 10:01:13 -07:00
Treehugger Robot
eacf1a6e85 Merge "Fixing protoOutParams concatenation." 2018-04-06 16:48:15 +00:00
Dan Willemsen
e66a2c96dc Allow boards to turn overriding commands into an error am: 3d60b115a0
am: faf45dedac

Change-Id: I06717df87681cb05a1fd0028ed1e9bb4f5b80557
2018-04-06 09:12:07 -07:00
Dan Willemsen
faf45dedac Allow boards to turn overriding commands into an error
am: 3d60b115a0

Change-Id: I6eb0d7d34a206922be59bc9501b11ca141fbbe18
2018-04-06 09:08:41 -07:00
Kweku Adams
fb5b31ce96 Fixing protoOutParams concatenation.
ParseGeneratorParameter delimits based on commas, not colons:
external/protobuf/src/google/protobuf/compiler/code_generator.cc

Bug: 72570104
Test: flash device with new build
Change-Id: I00042782a718d288ca6b0cb78f856d0fb223a926
2018-04-05 17:48:32 -07:00
Steven Moreland
ab4a214c76 Merge "Add vintf_fragments." am: 51ba4a7970
am: f974294c86

Change-Id: I0ed4fbbe7193687c9176a60bee639024b323612d
2018-04-05 16:24:34 -07:00
Dan Willemsen
3d60b115a0 Allow boards to turn overriding commands into an error
Many board still have this problem, but if we can switch some over,
we'll prevent global problems and have the ability to clean boards up
one-by-one.

Bug: 77611511
Test: lunch aosp_arm-eng; m nothing
Test: lunch aosp_marlin-eng; m nothing
Test: build_test on all downstream branches
Change-Id: I78bee44adde2059d01188658b9050927748d2028
2018-04-05 16:23:10 -07:00
Steven Moreland
f974294c86 Merge "Add vintf_fragments."
am: 51ba4a7970

Change-Id: Ia0000d21cf4cf5608549e997c06e01771b649dd3
2018-04-05 16:17:55 -07:00
Treehugger Robot
51ba4a7970 Merge "Add vintf_fragments." 2018-04-05 23:09:14 +00:00
Jeff Gaston
8fe16e50f7 Merge changes I3079cb4e,I55a786e9 am: fdc24d2f91
am: 5aaa818f96

Change-Id: I58c82332af1ac9f83c25dc9e4e6fdb297cd64963
2018-04-05 14:30:40 -07:00
Jeff Gaston
5aaa818f96 Merge changes I3079cb4e,I55a786e9
am: fdc24d2f91

Change-Id: Id1dcda0f1558eb475234fd0a1a87219bdd1e1ec5
2018-04-05 14:24:09 -07:00
Treehugger Robot
fdc24d2f91 Merge changes I3079cb4e,I55a786e9
* changes:
  Have pom2mk list all duplicates modules
  Have pom2mk include runtime deps too
2018-04-05 21:10:31 +00:00
Steven Moreland
57a23d2f20 Add vintf_fragments.
Bug: 66917623
Test: fragments are loaded in the right place
Test: boot device which is depending on fragments
Test: androidmk file which uses LOCAL_VINTF_FRAGMENTS properly
    converted
Change-Id: I366b731cf8d5ecf51851866f441ff1c517da75cf
2018-04-05 20:33:01 +00:00
Ryan Prichard
0fed7c8647 Fix mini_debug_info stripping when no symbols should be kept.
am: d2cc96c24a

Change-Id: I036366c1145000b25775da7371c280df5502a550
2018-04-04 18:15:54 -07:00
Jayant Chowdhary
c29ca8e329 Merge "Add informational message to help with updation of VNDK abi references." am: bc30a77591
am: dcd9c60461

Change-Id: I188545b2c980001e4f87ffe3e6d0fb070ae898e4
2018-04-04 17:14:44 -07:00
Jayant Chowdhary
dcd9c60461 Merge "Add informational message to help with updation of VNDK abi references."
am: bc30a77591

Change-Id: I824e905c05b326fab2e69da30e1c6c8d54162460
2018-04-04 17:04:41 -07:00
Jayant Chowdhary
bc30a77591 Merge "Add informational message to help with updation of VNDK abi references." 2018-04-04 23:40:06 +00:00
Ryan Prichard
d2cc96c24a Fix mini_debug_info stripping when no symbols should be kept.
If there are no symbols to keep (i.e. all function symbols are also in
the dynsym table), then the "${outfile}.keep_symbols" file has size 0.
When objcopy parses a --keep-symbols file, it has a special case for
0-sized files where it silently fails (exits with status 1, no error
message). On the other hand, objcopy is happy with a file containing no
symbols, as long as there is some whitespace or a comment. Avoid the
special case by appending a newline to keep_symbols.

Bug: b/62815515
Bug: b/77242617
Test: manual
Change-Id: I90fd3258426176dc18aa5a8c19389c55fe6329c7
(cherry picked from commit afefacf196)
2018-04-04 15:56:28 -07:00
Ryan Prichard
ec90794d08 Merge "Fix mini_debug_info stripping when no symbols should be kept." am: 4c65916c4e
am: 78b43b934f

Change-Id: Id4a91497f131a9dc51a13fab763dca36e88c193a
2018-04-03 21:56:29 -07:00
Ryan Prichard
78b43b934f Merge "Fix mini_debug_info stripping when no symbols should be kept."
am: 4c65916c4e

Change-Id: Ic2c651a9e1e6ea43185d6e1910f12a991e414c1b
2018-04-03 21:48:17 -07:00
Treehugger Robot
4c65916c4e Merge "Fix mini_debug_info stripping when no symbols should be kept." 2018-04-04 04:28:52 +00:00
Yifan Hong
172a7e3f29 [automerger skipped] Add overrides to cc_binary
am: d452a42d9d  -s ours

Change-Id: Ic0d4e6b1a535cba68dae85d7c0616b06b60b3eba
2018-04-03 20:42:44 -07:00
Yifan Hong
5219952328 Add overrides to cc_binary am: 946e32e184
am: 2744f3291b

Change-Id: I764246381d5083929f0a1b9218d382ccebe5956b
2018-04-03 18:40:42 -07:00
Yifan Hong
2744f3291b Add overrides to cc_binary
am: 946e32e184

Change-Id: Idd1a1b47d299cd0317cd1733888cb02bed68846f
2018-04-03 18:35:46 -07:00
Yifan Hong
d452a42d9d Add overrides to cc_binary
Test: use it for healthd, it is not installed.
Bug: 77541952

Change-Id: I170a31d1b4d15f20de6a6b6279a2eeda49ca7447
Merged-In: I170a31d1b4d15f20de6a6b6279a2eeda49ca7447
2018-04-03 16:15:37 -07:00
Yifan Hong
946e32e184 Add overrides to cc_binary
Test: use it for healthd, it is not installed.
Bug: 77541952

Change-Id: I170a31d1b4d15f20de6a6b6279a2eeda49ca7447
2018-04-03 16:02:29 -07:00
Yi Kong
7754a2737f [automerger skipped] [DO NOT MERGE] Switch to clang-4691093
am: c410909550  -s ours

Change-Id: I8b43a9410d47d59c34ad3de9fd14a0a81a3d6ab3
2018-04-03 13:26:22 -07:00
Ivan Lozano
9dfc876ab6 Support integer_overflow static lib diagnostics. am: a9255a8378
am: e586a753f2

Change-Id: I97c77a9f9bc8944756be65aa02e688440e14da60
2018-04-02 22:56:50 +00:00
Ivan Lozano
e586a753f2 Support integer_overflow static lib diagnostics.
am: a9255a8378

Change-Id: I328e6878c3de6f4612096728ede19728ffb7423a
2018-04-02 22:51:09 +00:00
Yi Kong
c410909550 [DO NOT MERGE] Switch to clang-4691093
Test: Build/boot marlin, sailfish, x86/arm/arm64 emulators
Bug: 68397894
Change-Id: Ic255b0b578838786f2bf54b53831f151187eaab0
2018-04-02 14:34:24 -07:00
Ivan Lozano
a9255a8378 Support integer_overflow static lib diagnostics.
This extends the minimal runtime dependency mutator to allow signed
and unsigned integer overflow diagnostics in static libraries and
binaries. This also enables the integer_overflow flag for static
libraries and binaries.

Note compilation will fail if the static library is a dependency
of a Make module that does not also have diagnostics enabled.

Bug: 66952339
Bug: 73283972
Test: make SANITIZE_TARGET{,_DIAG}=integer_overflow
Test: Enabled diagnostics in a static lib, saw results in logcat.
Test: Checked showcommands output for ubsan runtime library inclusion.

Change-Id: Ic52881a0f74cdcac0e4a15335df493b59b002ae5
2018-04-02 12:54:52 -07:00
Jiyong Park
43a5d5cc3f [automerger skipped] Merge "Allow platform modules to link to vendor public libraries" into pi-dev
am: 75c0008d7d  -s ours

Change-Id: I1cfb4ab82625ee7483cb7c6f081b039ed6a223c3
2018-03-31 01:23:48 +00:00
Jiyong Park
ad1c02f077 [automerger skipped] Allow platform modules to link to vendor public libraries
am: ca700f704f  -s ours

Change-Id: I7c3003cd224785bf0782ec69f3f4aa9155845ae1
2018-03-31 01:23:14 +00:00
TreeHugger Robot
75c0008d7d Merge "Allow platform modules to link to vendor public libraries" into pi-dev 2018-03-31 00:24:16 +00:00
Logan Chien
094e74bd6e [automerger skipped] Allow VNDK-SP extensions to use vendor lib
am: 6010adbbbb  -s ours

Change-Id: Ib9e4fcfc7944f687005dafba4ae5ec1457b26764
2018-03-30 20:49:32 +00:00
Jayant Chowdhary
d8b70a39d1 Add informational message to help with updation of VNDK abi references.
Test: create reference dump for libjpeg; add exported function to libjpeg;
      m -j libjpeg.vendor, build fails with helpful message.

Test: create reference dump for libjpeg; add exported function to libjpeg;
      m -j libjpeg.vendor dist DIST_DIR=dist, build fails with helpful message.

Change-Id: Iae25374fe937a0cbe8a8ddf9e23c3bc1f62bbb2a
2018-03-30 11:08:00 -07:00
Logan Chien
eee70303e9 Allow VNDK-SP extensions to use vendor lib am: d3c59a2b3a
am: f1e3014288

Change-Id: If054bb9b2e549905a1d163a28cc4923af6656d5e
2018-03-30 08:36:58 +00:00
Logan Chien
f1e3014288 Allow VNDK-SP extensions to use vendor lib
am: d3c59a2b3a

Change-Id: Ie609d0cc75418434ccc7763bcdf20e3787de1cc2
2018-03-30 08:32:23 +00:00
Logan Chien
6010adbbbb Allow VNDK-SP extensions to use vendor lib
This commit changes the VNDK-SP dependencies check.  With the commit,
VNDK-SP-Ext can link to non-VNDK vendor shared libs.  This commit also
refines the "cc_test" so that more error handling cases are properly
tested.

Before this commit, VNDK-SP-Ext could not depend on vendor libs.  It
was disallowed because there were no correct way to load vendor libs.
The fallback link had to specify the shared lib names.  On the other
hand, adding "/vendor/${LIB}" to search paths will lead to
double-loading issue.

In aosp/595067, "allow_all_shared_libs" was added to bionic dynamic
linker.  Now, we can link the "vndk" namespace to "sphal" namespace.
Thus, like VNDK-Ext, VNDK-SP-Ext can link to vendor libs now.

Bug: 77249955
Test: lunch aosp_walleye-userdebug && make -j8  # runs unit tests
Test: lunch aosp_sailfish-userdebug && make -j8  # runs unit tests
Test: Create a VNDK-SP-Ext, link to vendor libs, and run it.
Change-Id: I5511204539a22c998528111076f46756807faf29
Merged-In: I5511204539a22c998528111076f46756807faf29
(cherry picked from commit d3c59a2b3a)
2018-03-30 13:29:34 +08:00
Jiyong Park
ca700f704f Allow platform modules to link to vendor public libraries
Normally, when building with VNDK, platform modules are not allowed to
link against vendor libraries, because the ABI of the vendor libraries
are not guaranteed to be stable and may differ across multiple vendor
images.

However, the vendor public libraries are the exceptions. Vendor public
libraries are vendor libraries that are exposed to 3rd party apps and
listed in /vendor/etc/public.libraries.txt. Since they are intended to
be exposed to public, their ABI stability is guaranteed (by definition,
though it is up to the vendor to actually guarantee it).

This change provides a way to make a vendor lib as public by defining a
module of type 'vendor_public_library' with a map file that enumerates
public symbols that are publicized:

cc_library {
   name: "libvendor",
   proprietary: true,
   ...
}

vendor_public_library {
   name: "libvendor",
   symbol_file: "libvendor.map.txt",
}

This defines a stub library module named libvendor.vendorpublic from the
map file. `shared_libs: ["libvendor"]` is redirected to the stub library
when it is from the outside of the vendor partition.

Bug: 74275385
Test: m -j
Test: cc_test.go passes
Merged-In: I5bed94d7c4282b777632ab2f0fb63c203ee313ba
Change-Id: I5bed94d7c4282b777632ab2f0fb63c203ee313ba
(cherry picked from commit 374510bcb6)
2018-03-30 12:59:06 +09:00
Jiyong Park
87da05effd Merge "Allow platform modules to link to vendor public libraries" am: 01b715e94e
am: 0ab76cd099

Change-Id: I661c4cf4f957888999b4278b2b9dbaa72fa476a0
2018-03-30 03:55:42 +00:00
Jiyong Park
0ab76cd099 Merge "Allow platform modules to link to vendor public libraries"
am: 01b715e94e

Change-Id: Ib6ca3f52a41d0cc1acc228d74d64de9b764d0f39
2018-03-30 03:51:00 +00:00
Logan Chien
d3c59a2b3a Allow VNDK-SP extensions to use vendor lib
This commit changes the VNDK-SP dependencies check.  With the commit,
VNDK-SP-Ext can link to non-VNDK vendor shared libs.  This commit also
refines the "cc_test" so that more error handling cases are properly
tested.

Before this commit, VNDK-SP-Ext could not depend on vendor libs.  It
was disallowed because there were no correct way to load vendor libs.
The fallback link had to specify the shared lib names.  On the other
hand, adding "/vendor/${LIB}" to search paths will lead to
double-loading issue.

In aosp/595067, "allow_all_shared_libs" was added to bionic dynamic
linker.  Now, we can link the "vndk" namespace to "sphal" namespace.
Thus, like VNDK-Ext, VNDK-SP-Ext can link to vendor libs now.

Bug: 77249955
Test: lunch aosp_walleye-userdebug && make -j8  # runs unit tests
Test: lunch aosp_sailfish-userdebug && make -j8  # runs unit tests
Test: Create a VNDK-SP-Ext, link to vendor libs, and run it.
Change-Id: I5511204539a22c998528111076f46756807faf29
2018-03-30 11:46:26 +08:00
Treehugger Robot
01b715e94e Merge "Allow platform modules to link to vendor public libraries" 2018-03-30 03:41:22 +00:00
Vishwath Mohan
d86d9f2cbf Merge "Revert "Change PRODUCT_CFI_INCLUDE_PATHS to opt-out (Soong)"" am: f895051c85
am: 4c12a7b54e

Change-Id: I0d722f04c8ceb1e6f19155412fa386ffa530532b
2018-03-30 03:12:32 +00:00
Vishwath Mohan
4c12a7b54e Merge "Revert "Change PRODUCT_CFI_INCLUDE_PATHS to opt-out (Soong)""
am: f895051c85

Change-Id: I2477b19ad2d9c6ae08b23d9ac29c8ce1635382e1
2018-03-30 03:07:58 +00:00
Vishwath Mohan
f895051c85 Merge "Revert "Change PRODUCT_CFI_INCLUDE_PATHS to opt-out (Soong)"" 2018-03-30 02:58:32 +00:00
Vishwath Mohan
3af8ee0288 Revert "Change PRODUCT_CFI_INCLUDE_PATHS to opt-out (Soong)"
This reverts commit 289d548c3e.

Change-Id: Ic284687157d5cb4122899c84a37c5db507aaee2a
2018-03-30 02:55:23 +00:00