Merged contents of cf and cf_common branches
cf = cuttlefish master branch, cf_common = cuttlefish_common master branch
1. Deleted cf TEST_MAPPING and OWNERS
2. Merged tests/ directories since there was no overlap
3. Moved all of cf_commons unique directories in directly
4. grep'd and replaced all refs for cf_common paths with cf
5. Concatenated Android.bp contents from cf and cf_common
6. Replaced Android.mk in cf with Android.mk from cf_common. Changed reference
from all-makefiles to first-makefiles to enable a succesful cf launch.
Test: Treehugger
Bug: 143774116
Change-Id: Ic4a3690304b80867b615d1ecba165c17cfe78e92
diff --git a/Android.bp b/Android.bp
index 9fed081..86e4a08 100644
--- a/Android.bp
+++ b/Android.bp
@@ -110,3 +110,62 @@
host_supported: true,
defaults: ["cuttlefish_base"],
}
+
+cc_defaults {
+ name: "cuttlefish_recovery_available",
+ recovery_available : true
+}
+
+cc_defaults {
+ name: "enabled_on_p_and_later",
+ enabled: true
+}
+
+cc_defaults {
+ name: "enabled_on_q_and_later",
+ enabled: true
+}
+
+cc_defaults {
+ name: "enabled_on_q_internal_and_later",
+ enabled: true
+}
+
+cc_defaults {
+ name: "cuttlefish_host_config",
+ target: {
+ linux_glibc: {
+ static_libs: [
+ "libcuttlefish_host_config",
+ ],
+ },
+ },
+}
+
+cc_defaults {
+ name: "cuttlefish_libicuuc",
+ shared_libs: [
+ "libicuuc",
+ "libandroidicu",
+ ],
+}
+
+cc_defaults {
+ name: "cuttlefish_health_storage",
+ defaults: ["enabled_on_q_and_later"],
+ vintf_fragments: [
+ "manifest_android.hardware.health.storage@1.0.cuttlefish.xml",
+ ],
+}
+
+java_test_host {
+ name: "tombstone_transmit_tests",
+
+ libs: ["tradefed"],
+
+ srcs: ["tests/src/**/TombstoneTransmitTest.java"],
+
+ test_config: "tests/tombstone-transmit-tests.xml",
+
+ test_suites: ["general-tests"],
+}