Commit Graph

2526 Commits

Author SHA1 Message Date
Treehugger Robot bb5e5fb4c5 Merge changes Id38ce60b,I7c24c39b
* changes:
  Disable .toc generation for windows
  Add ctx.Windows()
2017-04-05 01:07:37 +00:00
Colin Cross d8f8d076c0 Disable .toc generation for windows
toc.sh doesn't support windows.

Bug: 36874115
Test: builds
Change-Id: Id38ce60bf2d11a56938eb37193589ccee845a855
2017-04-04 15:56:54 -07:00
Colin Cross 3edeee113a Add ctx.Windows()
Replace ctx.Os() == android.Windows with ctx.Windows()

Test: builds
Change-Id: I7c24c39bcf54a51ad152b21c0021e40a0c07f189
2017-04-04 15:39:04 -07:00
Dan Willemsen 866810db9f Exclude ndk stubs from notice file list
Set LOCAL_NO_NOTICE_FILE so that we don't list them in the third party
notices:

out/soong/ndk/platforms/android-10/arch-arm/usr/lib/libc.so
out/soong/ndk/platforms/android-10/arch-arm/usr/lib/liblog.so
...

These are just stub libraries, and aren't distributed on the device. The
real versions of these libraries will be distributed on the device, and
already have the license information.

Bug: 36867708
Test: Diff aosp_arm's system/etc/NOTICE.html.gz file before/after
Change-Id: Ib647c64e9ce55f700738b00d2ff685e784ed3801
2017-04-04 14:59:57 -07:00
Alex Naidis ac01ff5447 Add support for an armv8 variant for Kryo
* Use mcpu=cortex-a57, since it is the closest to Kryo.
* Clang doesn't support Kryo as a target yet.

Bug: 36728278

Test: Built and booted a sailfish using Kryo.

Change-Id: Ic0c9588d86fba41896e50e3f0cf0d2b310ffee93
Signed-off-by: Alex Naidis <alex.naidis@linux.com>
2017-04-04 19:09:43 +00:00
Alex Naidis ae4fc18406 Add support for an armv7 variant for Kryo
* Kryo is closer to Krait than to cortex-a53, so choose Krait defaults.

* Made together with Jake Weinstein (xboxfanj)

Bug: 36728278

Test: Built and boot sailfish set up as kryo.

Change-Id: I04fa0a1dca6f97ae19202d28ee3ce8a59bf169b5
Signed-off-by: Alex Naidis <alex.naidis@linux.com>
2017-04-04 19:09:36 +00:00
Steven Moreland 1889d015c5 Merge "multiproduct_kati: better directory names."
am: a41a5da52a

Change-Id: I332b487bdbce5a52b57d78cd1bc4999824b14d54
2017-04-04 17:21:13 +00:00
Treehugger Robot a41a5da52a Merge "multiproduct_kati: better directory names." 2017-04-04 17:16:06 +00:00
Jeff Gaston d3c86d2826 Merge "Microfactory support for transitive link dependencies"
am: 12bd6fef8a

Change-Id: Idd5666df91d58dd28a084857fba54a71da10c504
2017-04-04 00:49:56 +00:00
Treehugger Robot 12bd6fef8a Merge "Microfactory support for transitive link dependencies" 2017-04-04 00:42:40 +00:00
Dan Shi 10d454db64 Correct variable name LOCAL_COMPATIBILITY_SUITE
am: 4df566d313

Change-Id: I62520ce0a77d8817c6f89837d4774d3993870a73
2017-04-03 21:19:39 +00:00
Dan Shi 4df566d313 Correct variable name LOCAL_COMPATIBILITY_SUITE
Test: m -j checkbuild
Bug: 35394669
Change-Id: I117224b2266520e6aec44aef62551b0836a83520
2017-04-03 12:29:25 -07:00
Dan Albert 67e0712b17 Merge "Add `sdk_version: "minimum"`."
am: fe7f2f393b

Change-Id: I0c95617b21d1f717540e4bdd52cdeb8f9fe233ba
2017-04-01 04:56:32 +00:00
Treehugger Robot fe7f2f393b Merge "Add `sdk_version: "minimum"`." 2017-04-01 04:49:35 +00:00
Jeff Gaston 1ae73a67f0 Microfactory support for transitive link dependencies
Bug: 36816202
Test: make -j
Change-Id: Idbdf81002ed4c363a2b725905d91ffc204ef3d0e
2017-03-31 17:21:33 -07:00
Stephen Hines b3f4bc7df3 Merge "Add prebuilts/clang/host/linux-x86 to root.bp."
am: 3c0e2cdc41

Change-Id: I1411459a8019cbfb4566a68f277882fe00b0f99d
2017-03-31 23:58:24 +00:00
Treehugger Robot 3c0e2cdc41 Merge "Add prebuilts/clang/host/linux-x86 to root.bp." 2017-03-31 23:48:48 +00:00
Dan Albert 2e5d7d41f4 Add `sdk_version: "minimum"`.
This maps to the lowest supported API level for the given
architecture.

Test: make checkbuild # after setting some things to use this
Bug: None
Change-Id: Ied6d44cb2719b73f35dde38a2dca6d3c87c7c924
2017-03-31 16:19:51 -07:00
Dan Albert d8db841138 Generate file to map codenames to API levels.
am: 30c9d6e771

Change-Id: Ic2290130b7b675f3e82ba805bfe3b5a4fde6e249
2017-03-31 23:17:13 +00:00
Dan Albert 30c9d6e771 Generate file to map codenames to API levels.
The NDK stub library generator needs to know what unreleased API
levels exist and what the ordering is between them. This singleton
will later be expanded to generate api-level.h to cut down on
duplication.

Test: make out/soong/api_levels.json && cat out/soong/api_levels.json
Bug: None
Change-Id: I53126dd2cacb67c331c44f7d7c77c98b176b93cd
2017-03-31 12:27:42 -07:00
Vishwath Mohan d6f6ad8073 Merge "Refactor sanitized library on-disk layout - Soong."
am: 94e1747051

Change-Id: I823ad49a1f4ed6b0fbb683ffe186ca100700652d
2017-03-31 16:41:26 +00:00
Treehugger Robot 94e1747051 Merge "Refactor sanitized library on-disk layout - Soong." 2017-03-31 16:35:53 +00:00
Po Hu 121c009a5d Merge "Support prebuilt module types"
am: 3cfa1f2078

Change-Id: Ieffa5e62a50cb33aed55d8e43214aacea7861ef6
2017-03-31 08:59:17 +00:00
Treehugger Robot 3cfa1f2078 Merge "Support prebuilt module types" 2017-03-31 08:55:41 +00:00
Stephen Hines 07ce4ac01c Add prebuilts/clang/host/linux-x86 to root.bp.
Bug: http://b/35432050

This is used to support libFuzzer.a prebuilts.

Test: Builds successfully.
Change-Id: I4c2b9e83e88daf136f9017125205b61104c052b8
2017-03-31 00:38:03 -07:00
Stephen Hines b1953df15b Merge "Switch to clang-3859424."
am: 971b9848c0

Change-Id: I8ffb6944b8ad24bb6851568e5b74a308ef59c581
2017-03-31 04:56:09 +00:00
Stephen Hines 971b9848c0 Merge "Switch to clang-3859424." 2017-03-31 04:51:10 +00:00
Po Hu a2226b960a Support prebuilt module types
Now BUILD_PREBUILT should be converted into corresponding types
like cc_prebuilt_library_shared/cc_prebuilt_library_static ...
So change to check LOCAL_MODULE_CLASS in Android.mk to determine
module types, and eliminate class property from Android.bp which
will cause a build break.

Change-Id: If865cc865f360eac7cc77f060df5a310bada6900
Test: out/soong/host/linux-x86/bin/androidmk prebuilts/misc/common/ddmlib/Android.mk
2017-03-31 01:27:14 +00:00
Vishwath Mohan 1dd8839286 Refactor sanitized library on-disk layout - Soong.
This CL moves the location of ASAN-ified libraries on disk in the
following manner:
/data/lib* --> /data/asan/system/lib*
/data/vendor/* --> /data/asan/vendor/*

There are a couple of advantages to this, including better isolation
from other components, and more transparent linker renaming and
SELinux policies.

Bug: 36574794
Bug: 36674745
Test: m -j40 && SANITIZE_TARGET="address" m -j40 and the device
boots. All sanitized libraries are correctly located in /data/asan/*.

Change-Id: I06bf459260ec451d4495a02562f640ad622f34c2
2017-03-31 01:03:56 +00:00
Colin Cross 1cfcf8ba14 Fix include order
am: c31994825a

Change-Id: I1475eb8aa8431aa63a53af737c8e6373bbed2952
2017-03-31 00:55:18 +00:00
Colin Cross c31994825a Fix include order
Include order should be module includes, dependency exported includes,
and then global includes.  Module includes and global includes are
computed during compileFlags, but dependency exported includes are
not handled until later.  Move the global includes into a new
flags variable so that the dependency includes can be appended
to the module includes.

Test: m -j native
Change-Id: Ifc3894f0a898a070d6da8eed4f4b9e8cc0cd2523
2017-03-31 00:48:53 +00:00
Fabien Sanglard b6336e9f8f Merge "[CMakeList generator] Add headers to source files"
am: 4a825c7450

Change-Id: Iaeaeaf3dec6404387c4c2000111f9be0d3d0d4ef
2017-03-30 23:43:43 +00:00
Fabien Sanglard 4a825c7450 Merge "[CMakeList generator] Add headers to source files" 2017-03-30 23:41:52 +00:00
Sen Jiang 95804fb6c8 Merge "fileslist: hash the content of symlink, not the file it points to."
am: a0af35ca21

Change-Id: I42305a88ed368b085d4b3fb096d89ba85a1034a2
2017-03-30 18:40:23 +00:00
Sen Jiang a0af35ca21 Merge "fileslist: hash the content of symlink, not the file it points to." 2017-03-30 18:36:12 +00:00
Steven Moreland 552432e827 multiproduct_kati: better directory names.
Naming directories according to current date. This makes them easier to
parse when using the tool multiple time.

Also considered:
  millis := time.Now().UnixNano() / 1000000
  name := fmt.Sprintf("multiproduct-%d", millis)

Also considered putting separators in the number, but it makes for too
long of a directory name.

Test: multiproduct_kati
Change-Id: I10ac6754094653abf5bf11b04efc3c44905d3c8d
2017-03-29 22:38:42 -07:00
Dan Albert fbb051055b Merge "Use a timestamp file for preprocessed_ndk_headers."
am: 3e0ffcf2f5

Change-Id: I47abbf5177ddc1f9fac154758f5aee7b79474147
2017-03-30 04:50:34 +00:00
Treehugger Robot 3e0ffcf2f5 Merge "Use a timestamp file for preprocessed_ndk_headers." 2017-03-30 04:47:40 +00:00
Nan Zhang 2f6e3d869e Fixed the issue that phony module was broken.
am: 280802c102

Change-Id: If34522677e657af5344794ecae4da8ac37e57b8a
2017-03-30 03:11:28 +00:00
Dan Albert d2130a9359 Use a timestamp file for preprocessed_ndk_headers.
Having a directory as an output causes superfluous rebuilds, but we
can't have *only* implicit outputs.

Test: make ndk && make ndk
Bug: None
Change-Id: I8c2cd1df2ebf6e0cdb3a0441365d486708554010
2017-03-29 18:33:28 -07:00
Nan Zhang 280802c102 Fixed the issue that phony module was broken.
Phony module was broken since it reached the code line to try to
invoke some specific arch functions which caused the runtime panic
error.

Bug: 36739664
Test: mm -j32 -k
phony {
     name: "shell_and_utilities",
     required: [
         "grep",
         "gzip",
         "mkshrc",
         "reboot",
         "sh",
         "toolbox",
         "toybox",
     ],
}
in system/core/shell_and_utilities/Android.bp

Change-Id: Idf7da17d431aae5f0c56b08f5e5eef14ae4eef50
2017-03-29 17:43:47 -07:00
Sen Jiang 1b4141fbdf fileslist: hash the content of symlink, not the file it points to.
IsDir() doesn't handle the case where the file is a symlink to a
directory, which cause fileslist to crash.

The hash is used to validate whether system image is the same, so
hashing the content of symlink makes more sense.

Bug: 36274890
Test: joule builds
Change-Id: I6359418a5b28f8da13f85b01a30a72228fecf4ce
2017-03-29 13:43:41 -07:00
Dan Albert dcaee39be6 Merge "Move versioner's -o before positional arguments."
am: 8d4e936630

Change-Id: I74b05c3e765db46af1c186775566f248613b955c
2017-03-29 19:08:06 +00:00
Dan Albert 8d4e936630 Merge "Move versioner's -o before positional arguments." 2017-03-29 19:03:35 +00:00
Dan Albert e6a4d7c5e8 Move versioner's -o before positional arguments.
Mac's getopt can't handle this.

Test: make ndk # on mac
Bug: None
Change-Id: I5a4911632f3da77a5489571520526f90f5d80abf
2017-03-29 11:58:40 -07:00
Stephen Hines 4442c2f98e Switch to clang-3859424.
Bug: http://b/36442361
Test: Build and run multiple devices/targets.
Change-Id: Ib2ba71acdc5ae5100122bb498c5a51db74953d42
2017-03-28 22:10:38 -07:00
Dan Willemsen 16a6c9c720 Rework vndk detection
am: 11b261472a

Change-Id: If3217656c2dc8ec2027bb35cb97eb1b100aa9250
2017-03-29 04:40:07 +00:00
Dan Willemsen 11b261472a Rework vndk detection
Instead of having a module define `use_vndk: true`, assume that we're
building with the VNDK if we're installed on the vendor partition, and
BOARD_VNDK_VERSION==current. This now matches our behavior in Make.

Once BOARD_VNDK_VERSION!=current, we'll need to disable modules that
need to otherwise compile against the VNDK, since we can only compile
against the current VNDK.

Test: build.ninja for aosp_arm is the same before/after
Test: Ensure there are no boards that set BOARD_VNDK_VERSION
Change-Id: If937fa7bdb119648137af52daebadf486163484b
2017-03-29 04:33:25 +00:00
Pirama Arumuga Nainar 09a6e45d07 Merge "Export TSAN_RUNTIME_LIBRARY make variable"
am: 9e3f627ea7

Change-Id: I5d78bc0b33411c3832a734521cb5ca305a4f8d9a
2017-03-29 00:49:38 +00:00
Treehugger Robot 9e3f627ea7 Merge "Export TSAN_RUNTIME_LIBRARY make variable" 2017-03-29 00:45:35 +00:00