Commit Graph

1786 Commits

Author SHA1 Message Date
Dan Albert
d64d26089b Fix ndk_library following decorator refactor. am: 705c84b9ee am: 80f3a040cd
am: cf9511849e

Change-Id: I7ab71f94240a1643ba7ad5770242708b2dbd1e03
2016-08-08 20:54:49 +00:00
Dan Albert
cf9511849e Fix ndk_library following decorator refactor. am: 705c84b9ee
am: 80f3a040cd

Change-Id: I1c3583a9ef2d8dd8e7ca3415e28c8c0f69f8b13a
2016-08-08 20:51:49 +00:00
Dan Albert
80f3a040cd Fix ndk_library following decorator refactor.
am: 705c84b9ee

Change-Id: I228224014450f4cb2cdbf13bdcf3d94e8f95aa23
2016-08-08 20:49:21 +00:00
Dan Albert
705c84b9ee Fix ndk_library following decorator refactor.
https://android-review.googlesource.com/#/c/253603/ accidentally
dropped the ndk_library properties and was using the base cc
properties instead.

Change-Id: Ia2dcd767f98871dbdbbd9d0ff6d2a73b9b4889ac
2016-08-08 12:44:23 -07:00
Dan Albert
fc72614ddb Don't generate intermediate NDK libraries. am: 7fa7b2efd3 am: df66aa3ecf
am: d870e713f7

Change-Id: I1a56c40c76145be9234ffe7f6fd945b967541d55
2016-08-08 18:48:41 +00:00
Dan Albert
d870e713f7 Don't generate intermediate NDK libraries. am: 7fa7b2efd3
am: df66aa3ecf

Change-Id: I2ee3c895c79fec6bb99d18e292cc2f915391c1be
2016-08-08 18:46:11 +00:00
Dan Albert
df66aa3ecf Don't generate intermediate NDK libraries.
am: 7fa7b2efd3

Change-Id: I049ab976019bf085943cc4cf0bceb68e0c6ef59b
2016-08-08 18:44:14 +00:00
Dan Albert
7fa7b2efd3 Don't generate intermediate NDK libraries.
It's better to clip to the existing versions here rather than build
the lower levels as if they existed.

cc.Module's begin() will now normalize the sdk_version to a valid
value for the given architecture so that doesn't have to be checked
later.

Test: make checkbuild with all other libc ndk_library changes
Change-Id: I2fa834f7a1ac3b03a0723291778d86207fcfda72
2016-08-05 16:48:36 -07:00
Dan Willemsen
2572144164 Merge changes I5144bc62,Id6d6561f am: 8a274392ac am: f7f5b8c1b3
am: f1ce07a39d

Change-Id: I1a7475bcbc1c6fb063968502680db9cd95ee3f20
2016-08-05 20:59:58 +00:00
Dan Willemsen
f1ce07a39d Merge changes I5144bc62,Id6d6561f am: 8a274392ac
am: f7f5b8c1b3

Change-Id: Ie6d30dab008bb484ecf57366723add11dae4659a
2016-08-05 20:56:28 +00:00
Dan Willemsen
f7f5b8c1b3 Merge changes I5144bc62,Id6d6561f
am: 8a274392ac

Change-Id: I62a802f7ad60f9bd3a50ecf7f462642b10516fbd
2016-08-05 20:54:00 +00:00
Dan Willemsen
8a274392ac Merge changes I5144bc62,Id6d6561f
* changes:
  soong_jar: Hardcode time
  soong_jar: Implement symlinks, fix directories
2016-08-05 20:44:25 +00:00
Colin Cross
a535f5cb3b Refactor cc modules to use decorators instead of inheritance am: b916a38233 am: 91790d64c7
am: 63e86dbfa4

Change-Id: I66aa77b49b5e5d2afd840b55edc1e4839fdcaa1f
2016-08-05 18:50:31 +00:00
Colin Cross
c9cb37508f Remove unused flags.Nocrt am: 01344df46e am: 987c4de3cd
am: 740a99dde0

Change-Id: Ia05ba84b87118a8de99a45a26c4e8b491915fd18
2016-08-05 18:50:30 +00:00
Colin Cross
63e86dbfa4 Refactor cc modules to use decorators instead of inheritance am: b916a38233
am: 91790d64c7

Change-Id: I46d0939732bf21974a76e553b4a693e678c649c1
2016-08-05 18:48:00 +00:00
Colin Cross
740a99dde0 Remove unused flags.Nocrt am: 01344df46e
am: 987c4de3cd

Change-Id: Id671f404d4751789c9372eed3c335b65e2e3f8c1
2016-08-05 18:48:00 +00:00
Colin Cross
91790d64c7 Refactor cc modules to use decorators instead of inheritance
am: b916a38233

Change-Id: I3b43134205a739aa6e0baf2aef56507d1e1fa221
2016-08-05 18:45:32 +00:00
Colin Cross
987c4de3cd Remove unused flags.Nocrt
am: 01344df46e

Change-Id: I1c8c1dbf408072a1c6fb644151a3e33182665e52
2016-08-05 18:45:31 +00:00
Dan Willemsen
77a6b8655a soong_jar: Hardcode time
We want reproducible builds, so timestamps are not useful.

Change-Id: I5144bc62ac37c3c9d7e0638f3b3648a60d887702
2016-08-05 11:22:40 -07:00
Dan Willemsen
a59a3bc5ec soong_jar: Implement symlinks, fix directories
Ensure that we only create one directory entry, not one with a / at the
end and another without. Clean incoming paths to prevent other similar
duplicates.

When adding directories specified directly as inputs, use the relative
path just like files, not the full path.

Instead of traversing symlinks, addg them to the zip file directly.

Present an error instead of crashing when an input does not exist.

Change-Id: Id6d6561fe12c28398f6096bf9bcae602bb7aa491
2016-08-05 11:22:40 -07:00
Colin Cross
b916a38233 Refactor cc modules to use decorators instead of inheritance
For example , instead of trying to have libraryLinker inherit from
baseLinker and libraryCompiler inherit from baseCompiler, create a
single decorator object that wraps both baseLinker and baseCompiler.

Test: Builds, no unexpected changes to build.ninja
Change-Id: I2468adaea8466c203a240259ba5694b8b1df7a52
2016-08-05 10:25:09 -07:00
Colin Cross
01344df46e Remove unused flags.Nocrt
Nocrt is handled through deps.CrtBegin/End, flags.Nocrt is unused

Change-Id: I8ab5313bb2eb3a00e336504d6dd3813350fbe14d
Test: soong builds
2016-08-05 10:22:29 -07:00
Dan Albert
179e29dba1 Auto-fill ndkMigratedLibs. am: 7e9d295807 am: cbfe300d8a
am: ce010d0385

Change-Id: Iab84836a802fd753d96f584eef53bdf6f26ac4ed
2016-08-05 00:37:57 +00:00
Dan Albert
ce010d0385 Auto-fill ndkMigratedLibs. am: 7e9d295807
am: cbfe300d8a

Change-Id: I84dd8f4d445be8e1c7af16cf1889a601344ca851
2016-08-05 00:35:35 +00:00
Dan Albert
cbfe300d8a Auto-fill ndkMigratedLibs.
am: 7e9d295807

Change-Id: I2d20a3e4b7b87b86902fccd06e263f32d39a1494
2016-08-05 00:32:59 +00:00
Dan Albert
f7641dbe74 Merge "Check NDK API level link compatibility." am: 5c395b39b4 am: ae9175cefd
am: 7b1ae0859f

Change-Id: I43285cda1320f2f8285fa0a1a5d2701fa386344a
2016-08-04 23:26:52 +00:00
Dan Albert
7b1ae0859f Merge "Check NDK API level link compatibility." am: 5c395b39b4
am: ae9175cefd

Change-Id: Icf5c2e8cb87bd6e93ecc664c48ef728d71d55bd5
2016-08-04 23:24:22 +00:00
Dan Albert
ae9175cefd Merge "Check NDK API level link compatibility."
am: 5c395b39b4

Change-Id: I1ffa2f563e0693fbf95be28d777dfe7ea4f7d981
2016-08-04 23:21:54 +00:00
Dan Albert
7e9d295807 Auto-fill ndkMigratedLibs.
Change-Id: Ifb91f62eccb17dedb71c1a9a0f5c1471edbcbd44
2016-08-04 16:10:54 -07:00
Treehugger Robot
5c395b39b4 Merge "Check NDK API level link compatibility." 2016-08-04 23:07:16 +00:00
Colin Cross
bb04094a1d Merge "Don't cache InstallInData" am: a7d1d4b0aa am: 0a8fe7cf0d
am: 36a70cafea

Change-Id: Ifa2b84fad340e53e2a5e084cc9e188c8c0c05685
2016-08-04 21:48:16 +00:00
Colin Cross
36a70cafea Merge "Don't cache InstallInData" am: a7d1d4b0aa
am: 0a8fe7cf0d

Change-Id: Ic35a3cde1561986411679c33bdd56e9e97abd6ea
2016-08-04 21:45:46 +00:00
Colin Cross
0a8fe7cf0d Merge "Don't cache InstallInData"
am: a7d1d4b0aa

Change-Id: I37aaf58a0e3d4b4b0ceee66d561576aea5163154
2016-08-04 21:43:18 +00:00
Colin Cross
a7d1d4b0aa Merge "Don't cache InstallInData" 2016-08-04 21:02:56 +00:00
Dan Albert
f1c0a99f04 Use the version script for ndk_library. am: 2bc91ba549 am: a1b846602f
am: fe90232a83

Change-Id: Icbb38b6c809080c7f511659edccc87921a36c875
2016-08-04 18:29:39 +00:00
Dan Albert
fe90232a83 Use the version script for ndk_library. am: 2bc91ba549
am: a1b846602f

Change-Id: I85d7866cfe77585f1a44a6c9fd151906c79c0eaa
2016-08-04 18:26:03 +00:00
Dan Albert
a1b846602f Use the version script for ndk_library.
am: 2bc91ba549

Change-Id: I5b07296ad3f458f901ee99297eefc6d5b536896c
2016-08-04 18:23:34 +00:00
Dan Albert
9e10cd4746 Check NDK API level link compatibility.
Mixing NDK API levels is only supported when linking against something
equal or older.

Change-Id: I2c3022a3d75465b736f2e65160da3113cfd6e635
2016-08-03 14:31:25 -07:00
Colin Cross
8d8f8e21cc Don't cache InstallInData
Change-Id: If38670cc68989a7ec11ba5f8c71b1fac6c69f3a6
2016-08-03 11:57:50 -07:00
Dan Albert
2bc91ba549 Use the version script for ndk_library.
We were generating this, but not actually using it yet.

Test: `make ndk` with libc/libm migration patches, readelf generated
      libs.
Change-Id: I9aadf58307bc645b33cab5207409552c5046937a
2016-08-02 13:45:40 -07:00
Dan Albert
f92e49971d Merge changes I0f73b41a,I0cd2f80c am: f77e8d7ffc am: 4216e1e6f0
am: 4766dc34cb

Change-Id: If69460d8f665e3c7aaf93b5a58e615821f37cb80
2016-08-02 01:38:32 +00:00
Dan Albert
4766dc34cb Merge changes I0f73b41a,I0cd2f80c am: f77e8d7ffc
am: 4216e1e6f0

Change-Id: Ic4e561a64ba1f1a2883e47a85b37edb51e2d10ae
2016-08-02 01:36:03 +00:00
Dan Albert
4216e1e6f0 Merge changes I0f73b41a,I0cd2f80c
am: f77e8d7ffc

Change-Id: I4ddecc0a430e413016e65898470c7661829ca895
2016-08-02 01:33:33 +00:00
Treehugger Robot
f77e8d7ffc Merge changes I0f73b41a,I0cd2f80c
* changes:
  Add a real parser for the version scripts.
  Add tag for "versioned=API".
2016-08-02 01:26:41 +00:00
Colin Cross
e2f2cacbac Merge "Rename compiler, linker and installer methods to be unique" am: cab3d65445 am: 5cf03973aa
am: 211d787e49

Change-Id: Icb80ae98862e07b247c7977d9f207b586651a53b
2016-08-02 01:26:23 +00:00
Colin Cross
211d787e49 Merge "Rename compiler, linker and installer methods to be unique" am: cab3d65445
am: 5cf03973aa

Change-Id: I1fe2a4c79502eb34862228d8c68ebdacbf77f580
2016-08-02 00:39:58 +00:00
Colin Cross
5cf03973aa Merge "Rename compiler, linker and installer methods to be unique"
am: cab3d65445

Change-Id: Ide8b387dca1ba29eae3744cb39a9d6d1952ee9ba
2016-08-02 00:37:00 +00:00
Treehugger Robot
cab3d65445 Merge "Rename compiler, linker and installer methods to be unique" 2016-08-02 00:28:36 +00:00
Colin Cross
dfa25a8cbc Merge "Fix mac soong build" am: 35ef8bdf32 am: 5d90e94a62
am: e9175b4260

Change-Id: I427220546aa55f8dfac7ef38fed816d6330e30fa
2016-08-02 00:21:33 +00:00
Colin Cross
e9175b4260 Merge "Fix mac soong build" am: 35ef8bdf32
am: 5d90e94a62

Change-Id: Ieacd33cf3fb959e0c4e0a1d21c405d3a9e9eb1fb
2016-08-02 00:16:26 +00:00