StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,907 Commits 1 Branch 0 Tags
dead54fc06c397b51d624eaf0a5f18f0205b91a0
Commit Graph

6592 Commits

Author SHA1 Message Date
Sami Tolvanen
2a1697d983 am 8d212ea8: DO NOT MERGE: Change verity key formats 
* commit '8d212ea8735233211b38f55819841fa97a744eaa':
  DO NOT MERGE: Change verity key formats
 2014-11-13 23:53:41 +00:00
Yabin Cui
6da7611890 am eddd9fb0: Merge "kill HAVE_FORKEXEC" 
* commit 'eddd9fb03faa607c77feed1cea8f435df7f64140':
  kill HAVE_FORKEXEC
 2014-11-13 23:35:27 +00:00
Sami Tolvanen
8d212ea873 DO NOT MERGE: Change verity key formats 
Change boot, recovery, and verity metadata signing keys to use the
same PKCS8 / X.509 PEM format as the other signing keys, and update
build scripts to use correct arguments for the updated signing
tools.

Bug: 15984840
Bug: 18120110
Change-Id: I23ed5a004ecdad6cf7696487935ad5031eb8adf8
(cherry picked from commit 72d90eb189)
 2014-11-13 23:23:31 +00:00
Yabin Cui
eddd9fb03f Merge "kill HAVE_FORKEXEC" 2014-11-13 23:22:46 +00:00
Dmitriy Ivanov
179685c1c3 Switch --hash-style to gnu 
Bug: 18373609
Change-Id: Ia2c965fb86295858d9a97db2ec8d54d99e3d431f
 2014-11-13 14:51:10 -08:00
Yabin Cui
b4157cd7c5 am d3d6c383: Merge "kill HAVE_LOCALTIME_R" 
* commit 'd3d6c3830f2c1b25f97a8e0001edfda4583a309a':
  kill HAVE_LOCALTIME_R
 2014-11-13 20:09:30 +00:00
Yabin Cui
e9ae59b47f kill HAVE_LOCALTIME_R 
Bug: 18361583
Change-Id: If76334a6e18893b65d9b526271620a460a75bf22
 2014-11-13 11:51:37 -08:00
Yabin Cui
faddef7018 am 044568be: Merge "kill HAVE_GETHOSTBYNAME_R" 
* commit '044568be18bb67a254398d65c15fe5e9caeb9d02':
  kill HAVE_GETHOSTBYNAME_R
 2014-11-13 19:21:48 +00:00
Yabin Cui
19230103ee kill HAVE_GETHOSTBYNAME_R 
Bug: 18363225
Change-Id: Ib34c094cd21b2221178755acdd9475a5bc2bf2c0
 2014-11-13 10:25:56 -08:00
Sami Tolvanen
d5f799d181 Merge "Change verity key formats" 2014-11-13 17:12:27 +00:00
Elliott Hughes
cc12050f34 am 6c706222: Merge "Remove HAVE_SHORT_ENUMS." 
* commit '6c7062221b7582c5d41acdb7a1d865ca629707ed':
  Remove HAVE_SHORT_ENUMS.
 2014-11-13 05:27:44 +00:00
Elliott Hughes
0e3a0fcb95 Remove HAVE_SHORT_ENUMS. 
Change-Id: Ia0e8a52cd8d7655508754ec0a6482f2dd055a68e
 2014-11-12 21:07:07 -08:00
Yabin Cui
f552333888 am eb793be2: am 957037dc: Merge "kill HAVE_POSIX_FILEMAP" 
* commit 'eb793be2c7d93265f2d3490835f49be361eb4513':
  kill HAVE_POSIX_FILEMAP
 2014-11-13 02:16:43 +00:00
Yabin Cui
e9680c2212 kill HAVE_FORKEXEC 
Bug: 18317407
Change-Id: Idaff8a161305325dbb0a9e00764afe98b66e3312
 2014-11-12 17:15:30 -08:00
Yabin Cui
eb793be2c7 am 957037dc: Merge "kill HAVE_POSIX_FILEMAP" 
* commit '957037dc40c7be54e7ffa6f56cca48e9db31dc7b':
  kill HAVE_POSIX_FILEMAP
 2014-11-13 00:15:25 +00:00
Yabin Cui
957037dc40 Merge "kill HAVE_POSIX_FILEMAP" 2014-11-13 00:02:25 +00:00
Chih-Hung Hsieh
abb7939af6 am 7d8b4df9: am aea83e0d: Merge "Upgrade host tool to x86_64-linux-glibc2.15-4.8" 
* commit '7d8b4df9c4502330f79cb6ad4c6f6bf33010be83':
  Upgrade host tool to x86_64-linux-glibc2.15-4.8
 2014-11-12 23:26:39 +00:00
Chih-Hung Hsieh
7d8b4df9c4 am aea83e0d: Merge "Upgrade host tool to x86_64-linux-glibc2.15-4.8" 
* commit 'aea83e0dca9a70e53677c22c72034155311287ab':
  Upgrade host tool to x86_64-linux-glibc2.15-4.8
 2014-11-12 23:23:20 +00:00
Chih-Hung Hsieh
aea83e0dca Merge "Upgrade host tool to x86_64-linux-glibc2.15-4.8" 2014-11-12 23:13:36 +00:00
Dan Albert
8914f71cc0 Remove logic for platform stlport gtest. 
Now that the platforms stlport linked gtest is gone, we don't need the
logic for this any more. All platform tests will use libc++ (which has
been renamed to libgtest without a suffix).

Note that tests built with the NDK will still use stlport, but they
will use the NDK's stlport, not the platform's.

Bug: 15193147
Change-Id: Ifcb2489ed60c41e4ed028096b516c1ee643de907
 2014-11-11 17:45:45 -08:00
Dan Albert
6da20991fd am 5245bc8b: am 201f6b3e: Merge "Make modules depend on their makefile." 
* commit '5245bc8b3421b3a9676a9ad650d0804d8d9e2787':
  Make modules depend on their makefile.
 2014-11-11 23:00:40 +00:00
Dan Albert
5245bc8b34 am 201f6b3e: Merge "Make modules depend on their makefile." 
* commit '201f6b3e92a2ef2f3a117f33cd399d5304dd385a':
  Make modules depend on their makefile.
 2014-11-11 22:56:01 +00:00
Dan Albert
954b5bdcf4 Make modules depend on their makefile. 
This should obviate much of the need for cleanspecs, and also make it
unnecessary to continue adding LOCAL_ADDITIONAL_DEPENDENCIES for this
sort of thing all over the tree.

Change-Id: I97aa8fd280ae868a5f6364f8b7bf3c2fe235d6ce
 2014-11-11 14:30:54 -08:00
Dan Albert
655f7c9a82 am a9abc487: am 1f637158: Merge "Use platform protobuf unless building with NDK." 
* commit 'a9abc487a8fdf3a82932df3f70efd9aab7fb9d35':
  Use platform protobuf unless building with NDK.
 2014-11-11 20:05:56 +00:00
Dan Albert
a9abc487a8 am 1f637158: Merge "Use platform protobuf unless building with NDK." 
* commit '1f6371583ef6ce3a384262ebb291515f5ca3a7b6':
  Use platform protobuf unless building with NDK.
 2014-11-11 19:58:42 +00:00
Dan Albert
1f6371583e Merge "Use platform protobuf unless building with NDK." 2014-11-11 19:28:34 +00:00
Dan Albert
c3031c70f7 Use platform protobuf unless building with NDK. 
The NDK protobuf library depends on the final target linking stlport
(since it is a static library). Since the platform stlport is going
away, we need to use a separate version of the protobuf library that
is compiled for the platform against libc++.

Note that this should be the case for _all_ libraries built with the
NDK. If a library needs to be used by both an NDK built final target
and a platform built final target, there should be both an NDK and
platform version of the library.

Bug: 15193147
Change-Id: I0ead61c2d1cd9d0248b304ab7d8682dedd6e8366
 2014-11-11 11:05:27 -08:00
Yabin Cui
3b9d876f93 kill HAVE_POSIX_FILEMAP 
Bug: 18315579
Change-Id: I7a20ad40dc0ec121f0e84202831e6019005104e7
 2014-11-11 10:34:37 -08:00
Elliott Hughes
d59a919e01 am 20228b6e: am b3893943: Merge "Remove unused variables from select.mk." 
* commit '20228b6e4a499105816d7386c9da2820d6200ccf':
  Remove unused variables from select.mk.
 2014-11-11 18:11:58 +00:00
Elliott Hughes
20228b6e4a am b3893943: Merge "Remove unused variables from select.mk." 
* commit 'b38939436199c65299809f6adb50db6d3b44f7b0':
  Remove unused variables from select.mk.
 2014-11-11 18:07:44 +00:00
Elliott Hughes
b389394361 Merge "Remove unused variables from select.mk." 2014-11-11 17:59:17 +00:00
Yabin Cui
b082f088e2 am 899b1877: am 4dc8e856: Merge "remove __linux__ in AndroidConfig.h" 
* commit '899b18775b24379e8b4555f4327f6b5c07306608':
  remove __linux__ in AndroidConfig.h
 2014-11-11 17:45:15 +00:00
Yabin Cui
899b18775b am 4dc8e856: Merge "remove __linux__ in AndroidConfig.h" 
* commit '4dc8e8561fa807fb6417f1405f4364a1bf6d4060':
  remove __linux__ in AndroidConfig.h
 2014-11-11 17:40:51 +00:00
Elliott Hughes
a3850a976c Remove unused variables from select.mk. 
I've no idea what these were meant to be for, but they're unused.

Change-Id: I978568bd83f91eb952c35a3a481bd517312062f0
 2014-11-10 20:47:49 -08:00
Yabin Cui
70af4d3796 remove __linux__ in AndroidConfig.h 
Bug: 18316409
Change-Id: If6644074ec86efc2f9f91a98bf82fe26be6f66d3
 2014-11-10 19:14:56 -08:00
Greg Hartman
66aadaac60 am 089d7572: am 9f00b5a0: Restore the diskinstaller dependency, since it\'s needed for GCE. automerge: 2ebfef4 
* commit '089d75728ad9498833aef07e19112d2e7321f523':
  Restore the diskinstaller dependency, since it's needed for GCE.
 2014-11-11 03:01:50 +00:00
Greg Hartman
2dd7db8883 am 5c5b443f: am 711fe355: Add a hook for the syslinux bootloader. automerge: 4c46710 
* commit '5c5b443f91da85b84bec36a78dff223ec8b2b3fe':
  Add a hook for the syslinux bootloader.
 2014-11-11 03:01:49 +00:00
Greg Hartman
089d75728a am 9f00b5a0: Restore the diskinstaller dependency, since it\'s needed for GCE. automerge: 2ebfef4 
* commit '9f00b5a077afa9f1cc77ac9bd4e8edc9d9464ae2':
  Restore the diskinstaller dependency, since it's needed for GCE.
 2014-11-11 02:55:16 +00:00
Greg Hartman
5c5b443f91 am 711fe355: Add a hook for the syslinux bootloader. automerge: 4c46710 
* commit '711fe35574d5c2f7a668db1ca69a0ce13362fd31':
  Add a hook for the syslinux bootloader.
 2014-11-11 02:55:15 +00:00
Greg Hartman
9f00b5a077 Restore the diskinstaller dependency, since it\'s needed for GCE. 
automerge: 2ebfef4

* commit '2ebfef448465b99260b6900bc207d42ead09e96c':
  Restore the diskinstaller dependency, since it's needed for GCE.
 2014-11-11 02:47:55 +00:00
Greg Hartman
711fe35574 Add a hook for the syslinux bootloader. 
automerge: 4c46710

* commit '4c46710e7a5cbcb1807d183aaeb88d68f98b6753':
  Add a hook for the syslinux bootloader.
 2014-11-11 02:47:50 +00:00
Greg Hartman
2ebfef4484 Restore the diskinstaller dependency, since it's needed for GCE. 
Change-Id: Ieb2695afbe551e829357bad56d5fe1501165b495
 2014-11-11 02:27:46 +00:00
Greg Hartman
4c46710e7a Add a hook for the syslinux bootloader. 
Change-Id: Ia8638e9dcb025743a66c52ad43b161ee70602c89
 2014-11-11 02:26:50 +00:00
Yabin Cui
c509b393eb am 1f4d40be: am 86596342: Merge "kill OS_CASE_SENSITIVE" 
* commit '1f4d40be5d9ccaed6e60b2f511b22f8f31a75ef1':
  kill OS_CASE_SENSITIVE
 2014-11-11 02:26:03 +00:00
Yabin Cui
1f4d40be5d am 86596342: Merge "kill OS_CASE_SENSITIVE" 
* commit '8659634285d29edbbb364277f5950f41e26a15d4':
  kill OS_CASE_SENSITIVE
 2014-11-11 02:15:34 +00:00
Yabin Cui
8659634285 Merge "kill OS_CASE_SENSITIVE" 2014-11-11 01:08:46 +00:00
Yabin Cui
6c812d024b am 2c1eb2fe: am d8e38e1b: Merge "kill HAVE_INOTIFY" 
* commit '2c1eb2fe213ec9a9c66fd75b6224a4396c919e59':
  kill HAVE_INOTIFY
 2014-11-11 00:24:41 +00:00
Yabin Cui
da4eeab26b am c0ce08cc: am 3dbac214: Merge "kill HAVE_STAT_ST_MTIM" 
* commit 'c0ce08cc79d502c9cfd7fc2ca37a017b63552c68':
  kill HAVE_STAT_ST_MTIM
 2014-11-11 00:21:04 +00:00
Yabin Cui
2c1eb2fe21 am d8e38e1b: Merge "kill HAVE_INOTIFY" 
* commit 'd8e38e1b1ad62a2c2f981ce0bafd40f0cee5dcef':
  kill HAVE_INOTIFY
 2014-11-11 00:19:22 +00:00
Elliott Hughes
d9dfdd0ce1 am 499ed6c4: am 83da486c: Merge "Remove HAVE_DIRENT_D_TYPE." 
* commit '499ed6c496022acf5687c01bf2faf8420c6d3760':
  Remove HAVE_DIRENT_D_TYPE.
 2014-11-11 00:16:20 +00:00