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: [
+ "[email protected]",
+ ],
+}
+
+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"],
+}
diff --git a/Android.mk b/Android.mk
index 8e69e18..94584cc 100644
--- a/Android.mk
+++ b/Android.mk
@@ -13,5 +13,12 @@
# limitations under the License.
ifneq ($(filter vsoc_arm64 vsoc_x86 vsoc_x86_64, $(TARGET_BOARD_PLATFORM)),)
LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+include $(LOCAL_PATH)/fetcher.mk
+
+include $(CLEAR_VARS)
+include $(LOCAL_PATH)/host_package.mk
+
include $(call first-makefiles-under,$(LOCAL_PATH))
endif
diff --git a/temp/AndroidProducts.mk b/AndroidProducts.mk
similarity index 100%
rename from temp/AndroidProducts.mk
rename to AndroidProducts.mk
diff --git a/temp/CleanSpec.mk b/CleanSpec.mk
similarity index 100%
rename from temp/CleanSpec.mk
rename to CleanSpec.mk
diff --git a/temp/README.md b/README.md
similarity index 100%
rename from temp/README.md
rename to README.md
diff --git a/temp/default-permissions.xml b/default-permissions.xml
similarity index 100%
rename from temp/default-permissions.xml
rename to default-permissions.xml
diff --git a/temp/dtb.img b/dtb.img
similarity index 100%
rename from temp/dtb.img
rename to dtb.img
diff --git a/temp/fetcher.mk b/fetcher.mk
similarity index 100%
rename from temp/fetcher.mk
rename to fetcher.mk
diff --git a/guest/hals/camera/Android.mk b/guest/hals/camera/Android.mk
index 6a37cae..994d82f 100644
--- a/guest/hals/camera/Android.mk
+++ b/guest/hals/camera/Android.mk
@@ -60,7 +60,7 @@
endif
emulator_camera_c_includes := \
- device/google/cuttlefish_common \
+ device/google/cuttlefish \
frameworks/native/include/media/hardware \
$(call include-path-for, camera) \
diff --git a/guest/hals/gralloc/legacy/Android.mk b/guest/hals/gralloc/legacy/Android.mk
index ac789fb..7e9cc46 100644
--- a/guest/hals/gralloc/legacy/Android.mk
+++ b/guest/hals/gralloc/legacy/Android.mk
@@ -36,7 +36,7 @@
LOCAL_CFLAGS := $(VSOC_GRALLOC_COMMON_CFLAGS)
LOCAL_C_INCLUDES := \
- device/google/cuttlefish_common \
+ device/google/cuttlefish \
device/google/cuttlefish_kernel
LOCAL_HEADER_LIBRARIES := \
diff --git a/guest/hals/hwcomposer/cutf_cvm/Android.bp b/guest/hals/hwcomposer/cutf_cvm/Android.bp
index 5041b70..f79246f 100644
--- a/guest/hals/hwcomposer/cutf_cvm/Android.bp
+++ b/guest/hals/hwcomposer/cutf_cvm/Android.bp
@@ -23,7 +23,7 @@
"hwcomposer.cpp",
],
include_dirs: [
- "device/google/cuttlefish_common",
+ "device/google/cuttlefish",
],
export_include_dirs: ["."],
static_libs: [
diff --git a/guest/hals/lights/Android.mk b/guest/hals/lights/Android.mk
index 8c292dc..ce6d9e9 100644
--- a/guest/hals/lights/Android.mk
+++ b/guest/hals/lights/Android.mk
@@ -25,7 +25,7 @@
LOCAL_MULTILIB := first
LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES := device/google/cuttlefish_common
+LOCAL_C_INCLUDES := device/google/cuttlefish
LOCAL_HEADER_LIBRARIES := libhardware_headers
LOCAL_SHARED_LIBRARIES := liblog libcutils
LOCAL_SRC_FILES := lights_vsoc.c
diff --git a/guest/hals/ril/Android.mk b/guest/hals/ril/Android.mk
index b37e257..d3b9730 100644
--- a/guest/hals/ril/Android.mk
+++ b/guest/hals/ril/Android.mk
@@ -30,7 +30,7 @@
libcuttlefish_device_config \
LOCAL_C_INCLUDES := \
- device/google/cuttlefish_common \
+ device/google/cuttlefish \
device/google/cuttlefish_kernel
LOCAL_CFLAGS += \
diff --git a/guest/hals/ril/libril/Android.mk b/guest/hals/ril/libril/Android.mk
index f0fe2c7..1fe4986 100644
--- a/guest/hals/ril/libril/Android.mk
+++ b/guest/hals/ril/libril/Android.mk
@@ -49,7 +49,7 @@
libprotobuf-c-nano-enable_malloc \
LOCAL_C_INCLUDES += \
- device/google/cuttlefish_common \
+ device/google/cuttlefish \
hardware/include \
external/nanopb-c \
hardware/ril/include \
diff --git a/guest/hals/rild/Android.mk b/guest/hals/rild/Android.mk
index 01c709b..40e6b10 100644
--- a/guest/hals/rild/Android.mk
+++ b/guest/hals/rild/Android.mk
@@ -27,7 +27,7 @@
libril-cuttlefish-fork
LOCAL_C_INCLUDES += \
- device/google/cuttlefish_common
+ device/google/cuttlefish
# Temporary hack for broken vendor RILs.
LOCAL_WHOLE_STATIC_LIBRARIES := \
diff --git a/host/commands/assemble_cvd/image_aggregator.cc b/host/commands/assemble_cvd/image_aggregator.cc
index ed537d1..17fe9db 100644
--- a/host/commands/assemble_cvd/image_aggregator.cc
+++ b/host/commands/assemble_cvd/image_aggregator.cc
@@ -29,7 +29,7 @@
#include "common/libs/utils/files.h"
#include "common/libs/utils/subprocess.h"
#include "host/libs/config/cuttlefish_config.h"
-#include "device/google/cuttlefish_common/host/commands/assemble_cvd/cdisk_spec.pb.h"
+#include "device/google/cuttlefish/host/commands/assemble_cvd/cdisk_spec.pb.h"
namespace {
diff --git a/temp/host_package.mk b/host_package.mk
similarity index 100%
rename from temp/host_package.mk
rename to host_package.mk
diff --git a/temp/shared/Android.mk b/shared/Android.mk
similarity index 100%
rename from temp/shared/Android.mk
rename to shared/Android.mk
diff --git a/temp/shared/BoardConfig.mk b/shared/BoardConfig.mk
similarity index 100%
rename from temp/shared/BoardConfig.mk
rename to shared/BoardConfig.mk
diff --git a/temp/shared/auto/device.mk b/shared/auto/device.mk
similarity index 100%
rename from temp/shared/auto/device.mk
rename to shared/auto/device.mk
diff --git a/temp/shared/auto/manifest.xml b/shared/auto/manifest.xml
similarity index 100%
rename from temp/shared/auto/manifest.xml
rename to shared/auto/manifest.xml
diff --git a/temp/shared/config/Android.mk b/shared/config/Android.mk
similarity index 100%
rename from temp/shared/config/Android.mk
rename to shared/config/Android.mk
diff --git a/temp/shared/config/CleanSpec.mk b/shared/config/CleanSpec.mk
similarity index 100%
rename from temp/shared/config/CleanSpec.mk
rename to shared/config/CleanSpec.mk
diff --git a/temp/shared/config/audio_policy.conf b/shared/config/audio_policy.conf
similarity index 100%
rename from temp/shared/config/audio_policy.conf
rename to shared/config/audio_policy.conf
diff --git a/temp/shared/config/camera_v1.json b/shared/config/camera_v1.json
similarity index 100%
rename from temp/shared/config/camera_v1.json
rename to shared/config/camera_v1.json
diff --git a/temp/shared/config/camera_v3.json b/shared/config/camera_v3.json
similarity index 100%
rename from temp/shared/config/camera_v3.json
rename to shared/config/camera_v3.json
diff --git a/temp/shared/config/fstab b/shared/config/fstab
similarity index 100%
rename from temp/shared/config/fstab
rename to shared/config/fstab
diff --git a/temp/shared/config/fstab.composite b/shared/config/fstab.composite
similarity index 100%
rename from temp/shared/config/fstab.composite
rename to shared/config/fstab.composite
diff --git a/temp/shared/config/gen_wpa_supplicant_conf.sh b/shared/config/gen_wpa_supplicant_conf.sh
similarity index 100%
rename from temp/shared/config/gen_wpa_supplicant_conf.sh
rename to shared/config/gen_wpa_supplicant_conf.sh
diff --git a/temp/shared/config/init.common.rc b/shared/config/init.common.rc
similarity index 100%
rename from temp/shared/config/init.common.rc
rename to shared/config/init.common.rc
diff --git a/temp/shared/config/init.cutf_cvm.rc b/shared/config/init.cutf_cvm.rc
similarity index 100%
rename from temp/shared/config/init.cutf_cvm.rc
rename to shared/config/init.cutf_cvm.rc
diff --git a/temp/shared/config/init.hardware.usb.rc b/shared/config/init.hardware.usb.rc
similarity index 100%
rename from temp/shared/config/init.hardware.usb.rc
rename to shared/config/init.hardware.usb.rc
diff --git a/temp/shared/config/init.insmod.sh b/shared/config/init.insmod.sh
similarity index 100%
rename from temp/shared/config/init.insmod.sh
rename to shared/config/init.insmod.sh
diff --git a/temp/shared/config/init.product.rc b/shared/config/init.product.rc
similarity index 100%
rename from temp/shared/config/init.product.rc
rename to shared/config/init.product.rc
diff --git a/temp/shared/config/init.recovery.common.rc b/shared/config/init.recovery.common.rc
similarity index 100%
rename from temp/shared/config/init.recovery.common.rc
rename to shared/config/init.recovery.common.rc
diff --git a/temp/shared/config/init.recovery.cutf_cvm.rc b/shared/config/init.recovery.cutf_cvm.rc
similarity index 100%
rename from temp/shared/config/init.recovery.cutf_cvm.rc
rename to shared/config/init.recovery.cutf_cvm.rc
diff --git a/temp/shared/config/init.recovery.cutf_ivsh.rc b/shared/config/init.recovery.cutf_ivsh.rc
similarity index 100%
rename from temp/shared/config/init.recovery.cutf_ivsh.rc
rename to shared/config/init.recovery.cutf_ivsh.rc
diff --git a/temp/shared/config/manifest.xml b/shared/config/manifest.xml
similarity index 100%
rename from temp/shared/config/manifest.xml
rename to shared/config/manifest.xml
diff --git a/temp/shared/config/media_codecs.xml b/shared/config/media_codecs.xml
similarity index 100%
rename from temp/shared/config/media_codecs.xml
rename to shared/config/media_codecs.xml
diff --git a/temp/shared/config/media_codecs_google_video.xml b/shared/config/media_codecs_google_video.xml
similarity index 100%
rename from temp/shared/config/media_codecs_google_video.xml
rename to shared/config/media_codecs_google_video.xml
diff --git a/temp/shared/config/media_codecs_performance.xml b/shared/config/media_codecs_performance.xml
similarity index 100%
rename from temp/shared/config/media_codecs_performance.xml
rename to shared/config/media_codecs_performance.xml
diff --git a/temp/shared/config/media_profiles.xml b/shared/config/media_profiles.xml
similarity index 100%
rename from temp/shared/config/media_profiles.xml
rename to shared/config/media_profiles.xml
diff --git a/temp/shared/config/spn-conf.xml b/shared/config/spn-conf.xml
similarity index 100%
rename from temp/shared/config/spn-conf.xml
rename to shared/config/spn-conf.xml
diff --git a/temp/shared/config/ueventd.rc b/shared/config/ueventd.rc
similarity index 100%
rename from temp/shared/config/ueventd.rc
rename to shared/config/ueventd.rc
diff --git a/temp/shared/device.mk b/shared/device.mk
similarity index 100%
rename from temp/shared/device.mk
rename to shared/device.mk
diff --git a/temp/shared/go/device.mk b/shared/go/device.mk
similarity index 100%
rename from temp/shared/go/device.mk
rename to shared/go/device.mk
diff --git a/temp/shared/go_512/device.mk b/shared/go_512/device.mk
similarity index 100%
rename from temp/shared/go_512/device.mk
rename to shared/go_512/device.mk
diff --git a/temp/shared/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/shared/overlay/frameworks/base/core/res/res/xml/power_profile.xml
similarity index 100%
rename from temp/shared/overlay/frameworks/base/core/res/res/xml/power_profile.xml
rename to shared/overlay/frameworks/base/core/res/res/xml/power_profile.xml
diff --git a/temp/shared/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/shared/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
similarity index 100%
rename from temp/shared/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
rename to shared/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
diff --git a/temp/shared/phone/device.mk b/shared/phone/device.mk
similarity index 100%
rename from temp/shared/phone/device.mk
rename to shared/phone/device.mk
diff --git a/temp/shared/phone/device_vendor.mk b/shared/phone/device_vendor.mk
similarity index 100%
rename from temp/shared/phone/device_vendor.mk
rename to shared/phone/device_vendor.mk
diff --git a/temp/shared/releasetools.py b/shared/releasetools.py
similarity index 100%
rename from temp/shared/releasetools.py
rename to shared/releasetools.py
diff --git a/temp/shared/sepolicy/OWNERS b/shared/sepolicy/OWNERS
similarity index 100%
rename from temp/shared/sepolicy/OWNERS
rename to shared/sepolicy/OWNERS
diff --git a/temp/shared/sepolicy/private/file_contexts b/shared/sepolicy/private/file_contexts
similarity index 100%
rename from temp/shared/sepolicy/private/file_contexts
rename to shared/sepolicy/private/file_contexts
diff --git a/temp/shared/sepolicy/private/property_contexts b/shared/sepolicy/private/property_contexts
similarity index 100%
rename from temp/shared/sepolicy/private/property_contexts
rename to shared/sepolicy/private/property_contexts
diff --git a/temp/shared/sepolicy/private/suspend_blocker.te b/shared/sepolicy/private/suspend_blocker.te
similarity index 100%
rename from temp/shared/sepolicy/private/suspend_blocker.te
rename to shared/sepolicy/private/suspend_blocker.te
diff --git a/temp/shared/sepolicy/private/tombstone_transmit.te b/shared/sepolicy/private/tombstone_transmit.te
similarity index 100%
rename from temp/shared/sepolicy/private/tombstone_transmit.te
rename to shared/sepolicy/private/tombstone_transmit.te
diff --git a/temp/shared/sepolicy/vendor/adbd.te b/shared/sepolicy/vendor/adbd.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/adbd.te
rename to shared/sepolicy/vendor/adbd.te
diff --git a/temp/shared/sepolicy/vendor/bootanim.te b/shared/sepolicy/vendor/bootanim.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/bootanim.te
rename to shared/sepolicy/vendor/bootanim.te
diff --git a/temp/shared/sepolicy/vendor/bug_map b/shared/sepolicy/vendor/bug_map
similarity index 100%
rename from temp/shared/sepolicy/vendor/bug_map
rename to shared/sepolicy/vendor/bug_map
diff --git a/temp/shared/sepolicy/vendor/cameraserver.te b/shared/sepolicy/vendor/cameraserver.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/cameraserver.te
rename to shared/sepolicy/vendor/cameraserver.te
diff --git a/temp/shared/sepolicy/vendor/device.te b/shared/sepolicy/vendor/device.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/device.te
rename to shared/sepolicy/vendor/device.te
diff --git a/temp/shared/sepolicy/vendor/file.te b/shared/sepolicy/vendor/file.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/file.te
rename to shared/sepolicy/vendor/file.te
diff --git a/temp/shared/sepolicy/vendor/file_contexts b/shared/sepolicy/vendor/file_contexts
similarity index 100%
rename from temp/shared/sepolicy/vendor/file_contexts
rename to shared/sepolicy/vendor/file_contexts
diff --git a/temp/shared/sepolicy/vendor/gceservice.te b/shared/sepolicy/vendor/gceservice.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/gceservice.te
rename to shared/sepolicy/vendor/gceservice.te
diff --git a/temp/shared/sepolicy/vendor/genfs_contexts b/shared/sepolicy/vendor/genfs_contexts
similarity index 100%
rename from temp/shared/sepolicy/vendor/genfs_contexts
rename to shared/sepolicy/vendor/genfs_contexts
diff --git a/temp/shared/sepolicy/vendor/gmscore_app.te b/shared/sepolicy/vendor/gmscore_app.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/gmscore_app.te
rename to shared/sepolicy/vendor/gmscore_app.te
diff --git a/temp/shared/sepolicy/vendor/google/platform_app.te b/shared/sepolicy/vendor/google/platform_app.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/google/platform_app.te
rename to shared/sepolicy/vendor/google/platform_app.te
diff --git a/temp/shared/sepolicy/vendor/google/priv_app.te b/shared/sepolicy/vendor/google/priv_app.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/google/priv_app.te
rename to shared/sepolicy/vendor/google/priv_app.te
diff --git a/temp/shared/sepolicy/vendor/google/property.te b/shared/sepolicy/vendor/google/property.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/google/property.te
rename to shared/sepolicy/vendor/google/property.te
diff --git a/temp/shared/sepolicy/vendor/google/property_contexts b/shared/sepolicy/vendor/google/property_contexts
similarity index 100%
rename from temp/shared/sepolicy/vendor/google/property_contexts
rename to shared/sepolicy/vendor/google/property_contexts
diff --git a/temp/shared/sepolicy/vendor/google/ramdump_app.te b/shared/sepolicy/vendor/google/ramdump_app.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/google/ramdump_app.te
rename to shared/sepolicy/vendor/google/ramdump_app.te
diff --git a/temp/shared/sepolicy/vendor/google/seapp_contexts b/shared/sepolicy/vendor/google/seapp_contexts
similarity index 100%
rename from temp/shared/sepolicy/vendor/google/seapp_contexts
rename to shared/sepolicy/vendor/google/seapp_contexts
diff --git a/temp/shared/sepolicy/vendor/google/system_app.te b/shared/sepolicy/vendor/google/system_app.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/google/system_app.te
rename to shared/sepolicy/vendor/google/system_app.te
diff --git a/temp/shared/sepolicy/vendor/hal_bluetooth_sim.te b/shared/sepolicy/vendor/hal_bluetooth_sim.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/hal_bluetooth_sim.te
rename to shared/sepolicy/vendor/hal_bluetooth_sim.te
diff --git a/temp/shared/sepolicy/vendor/hal_camera_default.te b/shared/sepolicy/vendor/hal_camera_default.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/hal_camera_default.te
rename to shared/sepolicy/vendor/hal_camera_default.te
diff --git a/temp/shared/sepolicy/vendor/hal_drm_clearkey.te b/shared/sepolicy/vendor/hal_drm_clearkey.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/hal_drm_clearkey.te
rename to shared/sepolicy/vendor/hal_drm_clearkey.te
diff --git a/temp/shared/sepolicy/vendor/hal_drm_default.te b/shared/sepolicy/vendor/hal_drm_default.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/hal_drm_default.te
rename to shared/sepolicy/vendor/hal_drm_default.te
diff --git a/temp/shared/sepolicy/vendor/hal_drm_widevine.te b/shared/sepolicy/vendor/hal_drm_widevine.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/hal_drm_widevine.te
rename to shared/sepolicy/vendor/hal_drm_widevine.te
diff --git a/temp/shared/sepolicy/vendor/hal_dumpstate_impl.te b/shared/sepolicy/vendor/hal_dumpstate_impl.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/hal_dumpstate_impl.te
rename to shared/sepolicy/vendor/hal_dumpstate_impl.te
diff --git a/temp/shared/sepolicy/vendor/hal_gnss_default.te b/shared/sepolicy/vendor/hal_gnss_default.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/hal_gnss_default.te
rename to shared/sepolicy/vendor/hal_gnss_default.te
diff --git a/temp/shared/sepolicy/vendor/hal_graphics_allocator.te b/shared/sepolicy/vendor/hal_graphics_allocator.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/hal_graphics_allocator.te
rename to shared/sepolicy/vendor/hal_graphics_allocator.te
diff --git a/temp/shared/sepolicy/vendor/hal_graphics_allocator_default.te b/shared/sepolicy/vendor/hal_graphics_allocator_default.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/hal_graphics_allocator_default.te
rename to shared/sepolicy/vendor/hal_graphics_allocator_default.te
diff --git a/temp/shared/sepolicy/vendor/hal_graphics_composer.te b/shared/sepolicy/vendor/hal_graphics_composer.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/hal_graphics_composer.te
rename to shared/sepolicy/vendor/hal_graphics_composer.te
diff --git a/temp/shared/sepolicy/vendor/hal_graphics_composer_default.te b/shared/sepolicy/vendor/hal_graphics_composer_default.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/hal_graphics_composer_default.te
rename to shared/sepolicy/vendor/hal_graphics_composer_default.te
diff --git a/temp/shared/sepolicy/vendor/hal_neuralnetworks_sample.te b/shared/sepolicy/vendor/hal_neuralnetworks_sample.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/hal_neuralnetworks_sample.te
rename to shared/sepolicy/vendor/hal_neuralnetworks_sample.te
diff --git a/temp/shared/sepolicy/vendor/hal_sensors.te b/shared/sepolicy/vendor/hal_sensors.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/hal_sensors.te
rename to shared/sepolicy/vendor/hal_sensors.te
diff --git a/temp/shared/sepolicy/vendor/hal_tv_cec_mock.te b/shared/sepolicy/vendor/hal_tv_cec_mock.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/hal_tv_cec_mock.te
rename to shared/sepolicy/vendor/hal_tv_cec_mock.te
diff --git a/temp/shared/sepolicy/vendor/hal_vehicle_default.te b/shared/sepolicy/vendor/hal_vehicle_default.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/hal_vehicle_default.te
rename to shared/sepolicy/vendor/hal_vehicle_default.te
diff --git a/temp/shared/sepolicy/vendor/init.te b/shared/sepolicy/vendor/init.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/init.te
rename to shared/sepolicy/vendor/init.te
diff --git a/temp/shared/sepolicy/vendor/init_insmod_sh.te b/shared/sepolicy/vendor/init_insmod_sh.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/init_insmod_sh.te
rename to shared/sepolicy/vendor/init_insmod_sh.te
diff --git a/temp/shared/sepolicy/vendor/ip_link_add.te b/shared/sepolicy/vendor/ip_link_add.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/ip_link_add.te
rename to shared/sepolicy/vendor/ip_link_add.te
diff --git a/temp/shared/sepolicy/vendor/kernel.te b/shared/sepolicy/vendor/kernel.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/kernel.te
rename to shared/sepolicy/vendor/kernel.te
diff --git a/temp/shared/sepolicy/vendor/libcuttlefish_rild.te b/shared/sepolicy/vendor/libcuttlefish_rild.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/libcuttlefish_rild.te
rename to shared/sepolicy/vendor/libcuttlefish_rild.te
diff --git a/temp/shared/sepolicy/vendor/logpersist.te b/shared/sepolicy/vendor/logpersist.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/logpersist.te
rename to shared/sepolicy/vendor/logpersist.te
diff --git a/temp/shared/sepolicy/vendor/mediacodec.te b/shared/sepolicy/vendor/mediacodec.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/mediacodec.te
rename to shared/sepolicy/vendor/mediacodec.te
diff --git a/temp/shared/sepolicy/vendor/netd.te b/shared/sepolicy/vendor/netd.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/netd.te
rename to shared/sepolicy/vendor/netd.te
diff --git a/temp/shared/sepolicy/vendor/platform_app.te b/shared/sepolicy/vendor/platform_app.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/platform_app.te
rename to shared/sepolicy/vendor/platform_app.te
diff --git a/temp/shared/sepolicy/vendor/priv_app.te b/shared/sepolicy/vendor/priv_app.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/priv_app.te
rename to shared/sepolicy/vendor/priv_app.te
diff --git a/temp/shared/sepolicy/vendor/property.te b/shared/sepolicy/vendor/property.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/property.te
rename to shared/sepolicy/vendor/property.te
diff --git a/temp/shared/sepolicy/vendor/property_contexts b/shared/sepolicy/vendor/property_contexts
similarity index 100%
rename from temp/shared/sepolicy/vendor/property_contexts
rename to shared/sepolicy/vendor/property_contexts
diff --git a/temp/shared/sepolicy/vendor/recovery.te b/shared/sepolicy/vendor/recovery.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/recovery.te
rename to shared/sepolicy/vendor/recovery.te
diff --git a/temp/shared/sepolicy/vendor/rename_netiface.te b/shared/sepolicy/vendor/rename_netiface.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/rename_netiface.te
rename to shared/sepolicy/vendor/rename_netiface.te
diff --git a/temp/shared/sepolicy/vendor/seapp_contexts b/shared/sepolicy/vendor/seapp_contexts
similarity index 100%
rename from temp/shared/sepolicy/vendor/seapp_contexts
rename to shared/sepolicy/vendor/seapp_contexts
diff --git a/temp/shared/sepolicy/vendor/service.te b/shared/sepolicy/vendor/service.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/service.te
rename to shared/sepolicy/vendor/service.te
diff --git a/temp/shared/sepolicy/vendor/service_contexts b/shared/sepolicy/vendor/service_contexts
similarity index 100%
rename from temp/shared/sepolicy/vendor/service_contexts
rename to shared/sepolicy/vendor/service_contexts
diff --git a/temp/shared/sepolicy/vendor/setup_wifi.te b/shared/sepolicy/vendor/setup_wifi.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/setup_wifi.te
rename to shared/sepolicy/vendor/setup_wifi.te
diff --git a/temp/shared/sepolicy/vendor/shell.te b/shared/sepolicy/vendor/shell.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/shell.te
rename to shared/sepolicy/vendor/shell.te
diff --git a/temp/shared/sepolicy/vendor/socket_vsock_proxy.te b/shared/sepolicy/vendor/socket_vsock_proxy.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/socket_vsock_proxy.te
rename to shared/sepolicy/vendor/socket_vsock_proxy.te
diff --git a/temp/shared/sepolicy/vendor/surfaceflinger.te b/shared/sepolicy/vendor/surfaceflinger.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/surfaceflinger.te
rename to shared/sepolicy/vendor/surfaceflinger.te
diff --git a/temp/shared/sepolicy/vendor/system_app.te b/shared/sepolicy/vendor/system_app.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/system_app.te
rename to shared/sepolicy/vendor/system_app.te
diff --git a/temp/shared/sepolicy/vendor/system_server.te b/shared/sepolicy/vendor/system_server.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/system_server.te
rename to shared/sepolicy/vendor/system_server.te
diff --git a/temp/shared/sepolicy/vendor/te_macros b/shared/sepolicy/vendor/te_macros
similarity index 100%
rename from temp/shared/sepolicy/vendor/te_macros
rename to shared/sepolicy/vendor/te_macros
diff --git a/temp/shared/sepolicy/vendor/ueventd.te b/shared/sepolicy/vendor/ueventd.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/ueventd.te
rename to shared/sepolicy/vendor/ueventd.te
diff --git a/temp/shared/sepolicy/vendor/untrusted_app_all.te b/shared/sepolicy/vendor/untrusted_app_all.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/untrusted_app_all.te
rename to shared/sepolicy/vendor/untrusted_app_all.te
diff --git a/temp/shared/sepolicy/vendor/usbforward.te b/shared/sepolicy/vendor/usbforward.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/usbforward.te
rename to shared/sepolicy/vendor/usbforward.te
diff --git a/temp/shared/sepolicy/vendor/vendor_init.te b/shared/sepolicy/vendor/vendor_init.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/vendor_init.te
rename to shared/sepolicy/vendor/vendor_init.te
diff --git a/temp/shared/sepolicy/vendor/vport_trigger.te b/shared/sepolicy/vendor/vport_trigger.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/vport_trigger.te
rename to shared/sepolicy/vendor/vport_trigger.te
diff --git a/temp/shared/sepolicy/vendor/vsoc_input_service.te b/shared/sepolicy/vendor/vsoc_input_service.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/vsoc_input_service.te
rename to shared/sepolicy/vendor/vsoc_input_service.te
diff --git a/temp/shared/sepolicy/vendor/vsock_logcat.te b/shared/sepolicy/vendor/vsock_logcat.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/vsock_logcat.te
rename to shared/sepolicy/vendor/vsock_logcat.te
diff --git a/temp/shared/sepolicy/vendor/zygote.te b/shared/sepolicy/vendor/zygote.te
similarity index 100%
rename from temp/shared/sepolicy/vendor/zygote.te
rename to shared/sepolicy/vendor/zygote.te
diff --git a/temp/shared/tv/device.mk b/shared/tv/device.mk
similarity index 100%
rename from temp/shared/tv/device.mk
rename to shared/tv/device.mk
diff --git a/temp/shared/tv/manifest.xml b/shared/tv/manifest.xml
similarity index 100%
rename from temp/shared/tv/manifest.xml
rename to shared/tv/manifest.xml
diff --git a/temp/shared/tv/overlay/frameworks/base/core/res/res/values/config.xml b/shared/tv/overlay/frameworks/base/core/res/res/values/config.xml
similarity index 100%
rename from temp/shared/tv/overlay/frameworks/base/core/res/res/values/config.xml
rename to shared/tv/overlay/frameworks/base/core/res/res/values/config.xml
diff --git a/temp/shared/wpa_supplicant_overlay.conf b/shared/wpa_supplicant_overlay.conf
similarity index 100%
rename from temp/shared/wpa_supplicant_overlay.conf
rename to shared/wpa_supplicant_overlay.conf
diff --git a/temp/Android.bp b/temp/Android.bp
deleted file mode 100644
index 3daac1d..0000000
--- a/temp/Android.bp
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (C) 2018 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-
-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: [
- "[email protected]",
- ],
-}
-
-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"],
-}
diff --git a/temp/Android.mk b/temp/Android.mk
deleted file mode 100644
index f80aa86..0000000
--- a/temp/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Copyright 2017 The Android Open-Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-ifneq ($(filter $(TARGET_BOARD_PLATFORM), vsoc_arm64 vsoc_x86 vsoc_x86_64),)
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-include $(LOCAL_PATH)/fetcher.mk
-
-include $(CLEAR_VARS)
-include $(LOCAL_PATH)/host_package.mk
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
-endif
diff --git a/temp/OWNERS b/temp/OWNERS
deleted file mode 100644
index 9594320..0000000
--- a/temp/OWNERS
+++ /dev/null
@@ -1,8 +0,0 @@
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
diff --git a/temp/TEST_MAPPING b/temp/TEST_MAPPING
deleted file mode 100644
index 0e18f48..0000000
--- a/temp/TEST_MAPPING
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "presubmit": [
- {
- "name": "vts_treble_vintf_framework_test"
- },
- {
- "name": "vts_treble_vintf_vendor_test"
- },
- {
- "name": "hidl_implementation_test"
- }
- ]
-}
-
diff --git a/temp/tests/src/com/android/tests/tombstoneTransmit/TombstoneTransmitTest.java b/tests/src/com/android/tests/tombstoneTransmit/TombstoneTransmitTest.java
similarity index 100%
rename from temp/tests/src/com/android/tests/tombstoneTransmit/TombstoneTransmitTest.java
rename to tests/src/com/android/tests/tombstoneTransmit/TombstoneTransmitTest.java
diff --git a/temp/tests/tombstone-transmit-tests.xml b/tests/tombstone-transmit-tests.xml
similarity index 100%
rename from temp/tests/tombstone-transmit-tests.xml
rename to tests/tombstone-transmit-tests.xml
diff --git a/tools/create_base_image.sh b/tools/create_base_image.sh
index 950b993..bd85f0b 100755
--- a/tools/create_base_image.sh
+++ b/tools/create_base_image.sh
@@ -2,7 +2,7 @@
# Creates a base image suitable for booting cuttlefish on GCE
-source "${ANDROID_BUILD_TOP}/device/google/cuttlefish_common/tools/create_base_image_hostlib.sh"
+source "${ANDROID_BUILD_TOP}/device/google/cuttlefish/tools/create_base_image_hostlib.sh"
FLAGS "$@" || exit 1
main "${FLAGS_ARGV[@]}"
diff --git a/tools/create_base_image_hostlib.sh b/tools/create_base_image_hostlib.sh
index e5d2e3c..d3930db 100755
--- a/tools/create_base_image_hostlib.sh
+++ b/tools/create_base_image_hostlib.sh
@@ -73,7 +73,7 @@
"cuttlefish-common_${FLAGS_version}"
popd
source_files=(
- "${ANDROID_BUILD_TOP}/device/google/cuttlefish_common/tools/create_base_image_gce.sh"
+ "${ANDROID_BUILD_TOP}/device/google/cuttlefish/tools/create_base_image_gce.sh"
${scratch_dir}/*
)
if [[ -n "${INTERNAL_extra_source}" ]]; then
diff --git a/tools/gen_sha.sh b/tools/gen_sha.sh
index dec71f7..51dc76c 100755
--- a/tools/gen_sha.sh
+++ b/tools/gen_sha.sh
@@ -29,7 +29,7 @@
exit 1
fi
-cd "${ANDROID_BUILD_TOP}/device/google/cuttlefish_common"
+cd "${ANDROID_BUILD_TOP}/device/google/cuttlefish"
Sha=`git rev-parse HEAD`
cd - >/dev/null
cd "${ANDROID_BUILD_TOP}/external/u-boot"
diff --git a/temp/vsoc_arm64/BoardConfig.mk b/vsoc_arm64/BoardConfig.mk
similarity index 100%
rename from temp/vsoc_arm64/BoardConfig.mk
rename to vsoc_arm64/BoardConfig.mk
diff --git a/temp/vsoc_arm64/device.mk b/vsoc_arm64/device.mk
similarity index 100%
rename from temp/vsoc_arm64/device.mk
rename to vsoc_arm64/device.mk
diff --git a/temp/vsoc_arm64/phone/aosp_cf.mk b/vsoc_arm64/phone/aosp_cf.mk
similarity index 100%
rename from temp/vsoc_arm64/phone/aosp_cf.mk
rename to vsoc_arm64/phone/aosp_cf.mk
diff --git a/temp/vsoc_arm64/phone/overlay/frameworks/base/core/res/res/values/config.xml b/vsoc_arm64/phone/overlay/frameworks/base/core/res/res/values/config.xml
similarity index 100%
rename from temp/vsoc_arm64/phone/overlay/frameworks/base/core/res/res/values/config.xml
rename to vsoc_arm64/phone/overlay/frameworks/base/core/res/res/values/config.xml
diff --git a/temp/vsoc_x86/BoardConfig.mk b/vsoc_x86/BoardConfig.mk
similarity index 100%
rename from temp/vsoc_x86/BoardConfig.mk
rename to vsoc_x86/BoardConfig.mk
diff --git a/temp/vsoc_x86/auto/device.mk b/vsoc_x86/auto/device.mk
similarity index 100%
rename from temp/vsoc_x86/auto/device.mk
rename to vsoc_x86/auto/device.mk
diff --git a/temp/vsoc_x86/auto/overlay/frameworks/base/core/res/res/values/config.xml b/vsoc_x86/auto/overlay/frameworks/base/core/res/res/values/config.xml
similarity index 100%
rename from temp/vsoc_x86/auto/overlay/frameworks/base/core/res/res/values/config.xml
rename to vsoc_x86/auto/overlay/frameworks/base/core/res/res/values/config.xml
diff --git a/temp/vsoc_x86/device.mk b/vsoc_x86/device.mk
similarity index 100%
rename from temp/vsoc_x86/device.mk
rename to vsoc_x86/device.mk
diff --git a/temp/vsoc_x86/go_512_phone/device.mk b/vsoc_x86/go_512_phone/device.mk
similarity index 100%
rename from temp/vsoc_x86/go_512_phone/device.mk
rename to vsoc_x86/go_512_phone/device.mk
diff --git a/temp/vsoc_x86/go_phone/device.mk b/vsoc_x86/go_phone/device.mk
similarity index 100%
rename from temp/vsoc_x86/go_phone/device.mk
rename to vsoc_x86/go_phone/device.mk
diff --git a/temp/vsoc_x86/pasan/aosp_cf.mk b/vsoc_x86/pasan/aosp_cf.mk
similarity index 100%
rename from temp/vsoc_x86/pasan/aosp_cf.mk
rename to vsoc_x86/pasan/aosp_cf.mk
diff --git a/temp/vsoc_x86/phone/aosp_cf.mk b/vsoc_x86/phone/aosp_cf.mk
similarity index 100%
rename from temp/vsoc_x86/phone/aosp_cf.mk
rename to vsoc_x86/phone/aosp_cf.mk
diff --git a/temp/vsoc_x86/phone/device.mk b/vsoc_x86/phone/device.mk
similarity index 100%
rename from temp/vsoc_x86/phone/device.mk
rename to vsoc_x86/phone/device.mk
diff --git a/temp/vsoc_x86/phone/overlay/frameworks/base/core/res/res/values/config.xml b/vsoc_x86/phone/overlay/frameworks/base/core/res/res/values/config.xml
similarity index 100%
rename from temp/vsoc_x86/phone/overlay/frameworks/base/core/res/res/values/config.xml
rename to vsoc_x86/phone/overlay/frameworks/base/core/res/res/values/config.xml
diff --git a/temp/vsoc_x86/tv/device.mk b/vsoc_x86/tv/device.mk
similarity index 100%
rename from temp/vsoc_x86/tv/device.mk
rename to vsoc_x86/tv/device.mk
diff --git a/temp/vsoc_x86_64/BoardConfig.mk b/vsoc_x86_64/BoardConfig.mk
similarity index 100%
rename from temp/vsoc_x86_64/BoardConfig.mk
rename to vsoc_x86_64/BoardConfig.mk
diff --git a/temp/vsoc_x86_64/device.mk b/vsoc_x86_64/device.mk
similarity index 100%
rename from temp/vsoc_x86_64/device.mk
rename to vsoc_x86_64/device.mk
diff --git a/temp/vsoc_x86_64/phone/aosp_cf.mk b/vsoc_x86_64/phone/aosp_cf.mk
similarity index 100%
rename from temp/vsoc_x86_64/phone/aosp_cf.mk
rename to vsoc_x86_64/phone/aosp_cf.mk
diff --git a/temp/vsoc_x86_64/phone/overlay/frameworks/base/core/res/res/values/config.xml b/vsoc_x86_64/phone/overlay/frameworks/base/core/res/res/values/config.xml
similarity index 100%
rename from temp/vsoc_x86_64/phone/overlay/frameworks/base/core/res/res/values/config.xml
rename to vsoc_x86_64/phone/overlay/frameworks/base/core/res/res/values/config.xml
diff --git a/temp/vsoc_x86_noapex/BoardConfig.mk b/vsoc_x86_noapex/BoardConfig.mk
similarity index 100%
rename from temp/vsoc_x86_noapex/BoardConfig.mk
rename to vsoc_x86_noapex/BoardConfig.mk
diff --git a/temp/vsoc_x86_noapex/aosp_cf_noapex.mk b/vsoc_x86_noapex/aosp_cf_noapex.mk
similarity index 100%
rename from temp/vsoc_x86_noapex/aosp_cf_noapex.mk
rename to vsoc_x86_noapex/aosp_cf_noapex.mk
