Skip to content

Commit

Permalink
Upgrade to android-9.0.0_r33
Browse files Browse the repository at this point in the history
  • Loading branch information
nmeum committed Feb 13, 2019
1 parent cde6167 commit 7a220c7
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ set(ANDROID_MKE2FS_NAME "mke2fs.android")

# Version of android-tools and the version of boringssl being used.
# See: https://android.googlesource.com/platform/external/boringssl/+/android-${ANDROID_VERSION}/BORINGSSL_REVISION
set(ANDROID_VERSION 9.0.0_r3)
set(ANDROID_VERSION 9.0.0_r33)
set(BORINGSSL_VERSION 45210dd4e21ace9d28cb76b3f83303fcdd2efcce)

# The CMakeLists.txt in the vendor subdirectory is responsible for
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
From c5f7f3fa9d19e16850d0e1fd67c2415d0ac5c9ff Mon Sep 17 00:00:00 2001
From 3a5363e0b4fd7ed20225d8eda77d35e0073c02b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <[email protected]>
Date: Thu, 13 Sep 2018 23:16:04 +0200
Date: Tue, 12 Feb 2019 23:38:46 +0100
Subject: [PATCH] Don't use the internal glibc header sys/cdefs.h

This patch was created using sed(1) and ag(1) with the following script:
Expand Down Expand Up @@ -1059,7 +1059,7 @@ index 72e3f4a2b..64d060c6a 100644

#endif /* _LIBLMKD_UTILS_H_ */
diff --git a/lmkd/include/lmkd.h b/lmkd/include/lmkd.h
index fe6364d82..85e663703 100644
index e8f51da77..f44ff4f85 100644
--- a/lmkd/include/lmkd.h
+++ b/lmkd/include/lmkd.h
@@ -18,10 +18,11 @@
Expand All @@ -1076,8 +1076,8 @@ index fe6364d82..85e663703 100644

/*
* Supported LMKD commands
@@ -142,6 +143,8 @@ inline size_t lmkd_pack_set_procremove(LMKD_CTRL_PACKET packet,
return 2 * sizeof(int);
@@ -152,6 +153,8 @@ inline size_t lmkd_pack_set_procpurge(LMKD_CTRL_PACKET packet) {
return sizeof(int);
}

-__END_DECLS
Expand All @@ -1087,7 +1087,7 @@ index fe6364d82..85e663703 100644

#endif /* _LMKD_H_ */
diff --git a/lmkd/statslog.h b/lmkd/statslog.h
index edebb195b..4a43d99e9 100644
index 84584805d..06631524b 100644
--- a/lmkd/statslog.h
+++ b/lmkd/statslog.h
@@ -20,11 +20,12 @@
Expand All @@ -1105,7 +1105,7 @@ index edebb195b..4a43d99e9 100644

/*
* These are defined in
@@ -86,6 +87,8 @@ stats_write_lmk_kill_occurred(android_log_context ctx, int32_t code, int32_t uid
@@ -89,6 +90,8 @@ stats_write_lmk_kill_occurred(android_log_context ctx, int32_t code, int32_t uid
int64_t pgmajfault, int64_t rss_in_bytes, int64_t cache_in_bytes,
int64_t swap_in_bytes);

Expand Down
2 changes: 1 addition & 1 deletion vendor/core
Submodule core updated from 0fac90 to cddcc0
2 changes: 1 addition & 1 deletion vendor/e2fsprogs
Submodule e2fsprogs updated from fecf0a to 425d1b
2 changes: 1 addition & 1 deletion vendor/extras
Submodule extras updated from a4c6bb to 9ec7ba
2 changes: 1 addition & 1 deletion vendor/f2fs-tools
Submodule f2fs-tools updated from dbce69 to eeedf7
2 changes: 1 addition & 1 deletion vendor/selinux
Submodule selinux updated from 0d8f82 to ea4e51

0 comments on commit 7a220c7

Please sign in to comment.