Commit graph

1734 commits

Author SHA1 Message Date
Colin Cross
85871d8da4 Move global cppflags to the beginning of cppflags am: b668826a85
am: 88d3652f37

Change-Id: Ibad0eda62a3bec87717dc67b86315cf61907ae07
2016-11-25 18:31:37 +00:00
Colin Cross
d46f7b3dad genrule: let Android.bp file specify exported header dirs am: 5ed99c6472
am: c847ac3e62

Change-Id: I7214c0851fb411faeb90aecce52a704a0f848d54
2016-11-25 18:31:35 +00:00
Colin Cross
88d3652f37 Move global cppflags to the beginning of cppflags
am: b668826a85

Change-Id: Ia93b79e1c73dafdc9c2887af97d62e45681193d6
2016-11-25 18:25:37 +00:00
Colin Cross
c847ac3e62 genrule: let Android.bp file specify exported header dirs
am: 5ed99c6472

Change-Id: I222030cb0d7cc73d3332f7789507c40b961e4186
2016-11-25 18:25:35 +00:00
Colin Cross
ab73042865 Merge "genrule: support deps files" am: 10f96b1d77
am: 541a8a65ec

Change-Id: Ic1367aedc8462af0889a481b6b3d7d244652cef8
2016-11-23 23:46:42 +00:00
Colin Cross
541a8a65ec Merge "genrule: support deps files"
am: 10f96b1d77

Change-Id: I15148c3bd969f0ba78ee6c729916db460e55fa2d
2016-11-23 23:44:13 +00:00
Colin Cross
10f96b1d77 Merge "genrule: support deps files" 2016-11-23 23:38:28 +00:00
Colin Cross
88c9ef3737 Merge "genrule: expand $$ to $$" am: d328ad708e
am: a14071cf6c

Change-Id: Iebce684a4f9458e1ad6dd31ba90fa0101ffd8db7
2016-11-23 03:42:52 +00:00
Colin Cross
a14071cf6c Merge "genrule: expand $$ to $$"
am: d328ad708e

Change-Id: I012afbfb9c8afa0203ac59ffa4495476b4c393fd
2016-11-23 03:40:23 +00:00
Treehugger Robot
d328ad708e Merge "genrule: expand $$ to $$" 2016-11-23 03:37:59 +00:00
Stephen Hines
7cd796e94d Merge "Add proper use of LLVM_RELEASE_VERSION for locating libraries." am: 9dfd48b9bc
am: 35586f3802

Change-Id: I73795fb2aa74856727c5babd2335b90cd482021c
2016-11-23 02:31:19 +00:00
Stephen Hines
35586f3802 Merge "Add proper use of LLVM_RELEASE_VERSION for locating libraries."
am: 9dfd48b9bc

Change-Id: If02fd242fddb4ab32fbdac9b8cdf35bef1d9dba9
2016-11-23 02:28:48 +00:00
Stephen Hines
9dfd48b9bc Merge "Add proper use of LLVM_RELEASE_VERSION for locating libraries." 2016-11-23 02:23:46 +00:00
Colin Cross
44f1d08faa Add more whitelisted host libraries am: 124fd9afbd
am: 4c32014bc8

Change-Id: I6e305fa4084545faaa7238a9a5dafd40a99814ec
2016-11-23 01:46:15 +00:00
Colin Cross
4c32014bc8 Add more whitelisted host libraries
am: 124fd9afbd

Change-Id: I7456e636550e40c1c1729191f10670eda2580afa
2016-11-23 01:43:45 +00:00
Colin Cross
b668826a85 Move global cppflags to the beginning of cppflags
Global cppflags should come first so they can be overriden by module
cppflags.

Test: m -j checkbuild
Change-Id: I3454370a6b35f37982b1e0de2e0ec52b54974a8a
2016-11-22 15:41:09 -08:00
Colin Cross
5ed99c6472 genrule: let Android.bp file specify exported header dirs
Instead of exporting the generated sources dir as headers, let
the Android.bp file specify subdirectories as exported.

Test: m -j checkbuild
Change-Id: I18dd900d63ce7485c8fbfcc39dc77abad6f733d7
2016-11-22 15:41:09 -08:00
Colin Cross
33bfb0a36a genrule: support deps files
If a genrule sets deps_file: true, use a file in the gen directory
as a GCC-style deps file.

Test: m -j libLLVMObject
Change-Id: Id410165847e4eaea1853a392512e38787c431523
2016-11-22 15:41:09 -08:00
Colin Cross
2ee10a0659 genrule: expand $$ to $$
An escaped $ sign in an expanded string needs to be re-escaped so it
can pass through to ninja.

Test: m -j libLLVMObject
Change-Id: I2f7890417fd6f534e6e21cace3d86ae9ef708ce5
2016-11-22 15:41:08 -08:00
Colin Cross
124fd9afbd Add more whitelisted host libraries
Add AppKit, Foundation and Security to darwin for libchrome.

Add -lm and -lversion to windows for llvm.

Test: m -j libLLVMObject
Change-Id: Ie5c922d3fbb41fba1de5f1ce9e530683bf411c5a
2016-11-22 15:41:04 -08:00
Stephen Hines
e55a4cc594 Add proper use of LLVM_RELEASE_VERSION for locating libraries.
Bug: http://b/31532493

As I have been updating to LLVM ~4.0, there are numerous locations where
3.8 is hard-coded, and unable to be overridden. This change adds a new
function for getting the ClangShortVersion(), which can look at
environment variables that override this value (particularly useful for
two-stage compilation, where version numbers change between builds).

Change-Id: Iaec19908cf47b3b2317844d6e1329f7bcd81f022
2016-11-18 17:12:38 -08:00
Dan Willemsen
dc5d278e1c Add Toolchain.Bionic() am: 2e47b34435
am: 21cd6c847e

Change-Id: I205000ed05af834a68766799fb72a5491c96c93d
2016-11-18 03:15:33 +00:00
Dan Willemsen
1d91ced506 Allow Host cc_object and cc_toolchain_library am: 967c6a9b87
am: c97c4626b9

Change-Id: Iccd01ddbe3d83e44ca92dfbfe7c80ffb1003fb7e
2016-11-18 03:15:32 +00:00
Dan Willemsen
5567059f70 Add LinuxBionic OsType am: 00fcbde401
am: cf7da2e936

Change-Id: I758f7d3868208b777749a0103ceb5023177d29dd
2016-11-18 03:15:30 +00:00
Dan Willemsen
d34ae783fe Encode default enabled state in OsType am: 0a37a2a2b8
am: 7dbdaa7fa5

Change-Id: I78e864ac3ed9c9828077c8a9c3e57c3dd3372bb3
2016-11-18 03:15:29 +00:00
Dan Willemsen
21cd6c847e Add Toolchain.Bionic()
am: 2e47b34435

Change-Id: I66b2502c56b3b44794679cd258ec0dc8c194012d
2016-11-18 03:13:02 +00:00
Dan Willemsen
c97c4626b9 Allow Host cc_object and cc_toolchain_library
am: 967c6a9b87

Change-Id: Ia4025f09a116e8e49ed009d7231be3d9beab0202
2016-11-18 03:13:02 +00:00
Dan Willemsen
cf7da2e936 Add LinuxBionic OsType
am: 00fcbde401

Change-Id: Ie41af907b555ece88cda7b571f593e4ad957b8a6
2016-11-18 03:13:01 +00:00
Dan Willemsen
7dbdaa7fa5 Encode default enabled state in OsType
am: 0a37a2a2b8

Change-Id: I8377ced8a03bdd2f1dec123f59aab7d19ed2beb4
2016-11-18 03:12:59 +00:00
Dan Willemsen
2e47b34435 Add Toolchain.Bionic()
Move some cc ctx.Host() / ctx.Device() checks over to using
ctx.toolchain().Bionic(). There will be more changes, these are just the
obvious ones dealing with host_ldlibs / crt / system libraries.

Bug: 31559095
Test: out/soong/build.ninja is identical
Change-Id: Ibba60483b4ab0e01f6996eb7d883120e4acc1830
2016-11-17 01:50:43 -08:00
Dan Willemsen
967c6a9b87 Allow Host cc_object and cc_toolchain_library
In preparation for LinuxBionic.

Bug: 31559095
Test: out/soong/build.ninja is identical
Change-Id: I8e4631ccc3ad5161d76871a43f31d5a4ecbd39c0
2016-11-17 01:50:14 -08:00
Dan Willemsen
00fcbde401 Add LinuxBionic OsType
Actual support will come in later changes.

Bug: 31559095
Test: out/soong/build.ninja is identical
Change-Id: I31392fb78a51f43567d16aef89e32cd5137cdbc1
2016-11-17 01:49:50 -08:00
Dan Willemsen
0a37a2a2b8 Encode default enabled state in OsType
Currently our only default-disabled Os is Windows since it's HostCross,
but we'll be adding non-default Host and Device types in the future.

Bug: 31559095
Test: out/soong/build.ninja is identical
Change-Id: I2bc3a3cc76f2c95ea040bc34ba6706fcc178c68d
2016-11-17 01:49:39 -08:00
Dan Albert
9ce4703a8e Support sdk_version: "current" for the NDK. am: ebedf678de
am: f17634d777

Change-Id: I64e16daecb92f4b9dc192b760630d89c72097274
2016-11-11 02:28:49 +00:00
Dan Albert
f17634d777 Support sdk_version: "current" for the NDK.
am: ebedf678de

Change-Id: I4acb096fb922c2c692590dbbf92147a7c54eb795
2016-11-11 02:21:47 +00:00
Dan Albert
568bf7895b Allow first_version: "current" in ndk_library. am: 90f7a4dcab
am: e7754d3f27

Change-Id: I068a5bb146ebe039d20edca0293c974f077bdb1a
2016-11-11 00:02:39 +00:00
Dan Albert
cdba11e9fe Generate "current" API level. am: fd86e9ee21
am: bb53f9a3cb

Change-Id: I5ab4fb17026538c7a3a1ebdb56a4f87d7a381342
2016-11-11 00:02:38 +00:00
Dan Albert
e7754d3f27 Allow first_version: "current" in ndk_library.
am: 90f7a4dcab

Change-Id: I7141ce08ce3fbc9506a8d05db33d8a61a84ace8d
2016-11-10 23:55:09 +00:00
Dan Albert
bb53f9a3cb Generate "current" API level.
am: fd86e9ee21

Change-Id: I81251ad8358a6412962e328a85a86f6f42c77d92
2016-11-10 23:55:08 +00:00
Dan Albert
ebedf678de Support sdk_version: "current" for the NDK.
We need to fall back to the old CRT objects since we aren't generating
those yet.

Test: Created a test module using "current", checked that it linked
      the libs from current.
Bug: None

Change-Id: I5fe170d7b26154da8877672ac2acb7da0262fe38
2016-11-10 14:01:08 -08:00
Dan Albert
90f7a4dcab Allow first_version: "current" in ndk_library.
Test: Added a test module that uses this
      find $SOONG_OUT -name libfoo.so # only shows up in current
Bug: None

Change-Id: Ic88d7c598cd5b6ded8fb851a7eaf859806336af7
2016-11-10 14:01:08 -08:00
Dan Albert
fd86e9ee21 Generate "current" API level.
Support for using this coming in an upcoming patch.

Test: nose2
      readelf to check the following:
      * bsd_signal unversioned before current
      * bsd_signal versioned in current
      * catclose missing before current
      * catclose present and versioned in current
Bug: None
Change-Id: I861862161426d3ec5b530e3156d3a8ae96fed468
2016-11-10 13:49:26 -08:00
Dan Albert
fb223f6e93 Revert "Revert "Use the platform SDK version from the config."" am: 073379e549
am: 1cbdfe9068

Change-Id: I4d09c4e3310bf7e82c243b6b940a8796e3afdd1a
2016-11-10 21:47:00 +00:00
Dan Albert
4286d2c12a Fix the Platform_sdk_version default. am: 22c0b4131d
am: cee02d71f7

Change-Id: Ic46afde2e4df4eea72cc587424b9411602f1be70
2016-11-10 21:46:59 +00:00
Dan Albert
1cbdfe9068 Revert "Revert "Use the platform SDK version from the config.""
am: 073379e549

Change-Id: I8d333d190f6e7a19de3858b9382383d7179d980b
2016-11-10 21:39:59 +00:00
Dan Albert
cee02d71f7 Fix the Platform_sdk_version default.
am: 22c0b4131d

Change-Id: I7b76711050b3a3aa9164c99fd48c20694367671c
2016-11-10 21:39:58 +00:00
Dan Albert
073379e549 Revert "Revert "Use the platform SDK version from the config.""
This reverts commit 74b8b55bb2.

Test: OUT_DIR=ndk-out DIST_DIR=ndk-dist \
          build/soong/scripts/build-ndk-prebuilts.sh
Bug: None

Change-Id: Ia320609ec6fb382b13ff9007a6496b73198ff871
2016-11-10 11:11:07 -08:00
Dan Albert
22c0b4131d Fix the Platform_sdk_version default.
N has merged into aosp now.

Test: OUT_DIR=ndk-out DIST_DIR=ndk-dist \
          build/soong/scripts/build-ndk-prebuilts.sh
Bug: None

Change-Id: I2685c700e2cb138708a3e8a5f51281c30fb582db
2016-11-10 11:11:07 -08:00
Dan Albert
e0edc58efe Merge "Revert "Use the platform SDK version from the config."" am: 8f0f1757f5
am: c273d449e2

Change-Id: I63f83692fe66fc0b33ef3e2e843816079c8dd116
2016-11-10 18:10:14 +00:00
Dan Albert
c273d449e2 Merge "Revert "Use the platform SDK version from the config.""
am: 8f0f1757f5

Change-Id: Ida38854d79f2443f15e5121bb866f17619fd0f0a
2016-11-10 18:03:44 +00:00