Allow debugfs on debuggable builds for level R.
Test: build user and userdebug
Bug: 152633647
Change-Id: I5af37ed86730e9745c31a564f548dfb35355f21b
(cherry picked from commit 93dfd48b7d0cc94aadfcb09e267cb83440d6866d)
Merged-In: I5af37ed86730e9745c31a564f548dfb35355f21b
diff --git a/r/android-4.14/Android.bp b/r/android-4.14/Android.bp
index a837efa..63d954b 100644
--- a/r/android-4.14/Android.bp
+++ b/r/android-4.14/Android.bp
@@ -16,6 +16,10 @@
name: "kernel_config_r_4.14",
srcs: [
"android-base.config",
+ "non_debuggable.config",
+ ],
+ debuggable_srcs: [
+ "android-base.config",
],
meta: "android-base-conditional.xml",
}
diff --git a/r/android-4.14/android-base.config b/r/android-4.14/android-base.config
index 3259953..778e93a 100644
--- a/r/android-4.14/android-base.config
+++ b/r/android-4.14/android-base.config
@@ -1,6 +1,5 @@
# KEEP ALPHABETICALLY SORTED
# CONFIG_CRYPTO_MD4 is not set
-# CONFIG_DEBUG_FS is not set
# CONFIG_DEVMEM is not set
# CONFIG_FHANDLE is not set
# CONFIG_IP6_NF_NAT is not set
diff --git a/r/android-4.14/non_debuggable.config b/r/android-4.14/non_debuggable.config
new file mode 100644
index 0000000..71b51bf
--- /dev/null
+++ b/r/android-4.14/non_debuggable.config
@@ -0,0 +1,2 @@
+# KEEP ALPHABETICALLY SORTED
+# CONFIG_DEBUG_FS is not set
diff --git a/r/android-4.19/Android.bp b/r/android-4.19/Android.bp
index b56987d..e9b38fa 100644
--- a/r/android-4.19/Android.bp
+++ b/r/android-4.19/Android.bp
@@ -16,6 +16,10 @@
name: "kernel_config_r_4.19",
srcs: [
"android-base.config",
+ "non_debuggable.config",
+ ],
+ debuggable_srcs: [
+ "android-base.config",
],
meta: "android-base-conditional.xml",
}
diff --git a/r/android-4.19/android-base.config b/r/android-4.19/android-base.config
index 5a9bb10..0937ee6 100644
--- a/r/android-4.19/android-base.config
+++ b/r/android-4.19/android-base.config
@@ -1,7 +1,6 @@
# KEEP ALPHABETICALLY SORTED
# CONFIG_BPFILTER is not set
# CONFIG_CRYPTO_MD4 is not set
-# CONFIG_DEBUG_FS is not set
# CONFIG_DEVMEM is not set
# CONFIG_FHANDLE is not set
# CONFIG_FW_CACHE is not set
diff --git a/r/android-4.19/non_debuggable.config b/r/android-4.19/non_debuggable.config
new file mode 100644
index 0000000..71b51bf
--- /dev/null
+++ b/r/android-4.19/non_debuggable.config
@@ -0,0 +1,2 @@
+# KEEP ALPHABETICALLY SORTED
+# CONFIG_DEBUG_FS is not set
diff --git a/r/android-5.4/Android.bp b/r/android-5.4/Android.bp
index 66a0903..0245b4c 100644
--- a/r/android-5.4/Android.bp
+++ b/r/android-5.4/Android.bp
@@ -16,6 +16,10 @@
name: "kernel_config_r_5.4",
srcs: [
"android-base.config",
+ "non_debuggable.config",
+ ],
+ debuggable_srcs: [
+ "android-base.config",
],
meta: "android-base-conditional.xml",
}
diff --git a/r/android-5.4/android-base.config b/r/android-5.4/android-base.config
index c19b696..e33471e 100644
--- a/r/android-5.4/android-base.config
+++ b/r/android-5.4/android-base.config
@@ -1,7 +1,6 @@
# KEEP ALPHABETICALLY SORTED
# CONFIG_BPFILTER is not set
# CONFIG_CRYPTO_MD4 is not set
-# CONFIG_DEBUG_FS is not set
# CONFIG_DEVMEM is not set
# CONFIG_FHANDLE is not set
# CONFIG_FW_CACHE is not set
diff --git a/r/android-5.4/non_debuggable.config b/r/android-5.4/non_debuggable.config
new file mode 100644
index 0000000..71b51bf
--- /dev/null
+++ b/r/android-5.4/non_debuggable.config
@@ -0,0 +1,2 @@
+# KEEP ALPHABETICALLY SORTED
+# CONFIG_DEBUG_FS is not set
