Merge remote-tracking branch 'goog/oc-gce-dev' into prerelease

Test: Local boot

Change-Id: I1ababa53f508c9669e364060a7e3de73e222333a

15 files changed, 93 insertions, 22 deletions

diff --git a/Android.mk b/Android.mk
index f73a6c1d1..b0234eb1a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,5 +16,9 @@
 
 ifneq ($(filter $(TARGET_DEVICE), vsoc_x86 vsoc_x86_64),)
 LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+include $(LOCAL_PATH)/host_package.mk
+
 include $(call all-makefiles-under,$(LOCAL_PATH))
 endif
diff --git a/host_package.mk b/host_package.mk
new file mode 100644
index 000000000..c0a74a905
--- /dev/null
+++ b/host_package.mk
@@ -0,0 +1,48 @@
+LOCAL_PATH := $(call my-dir)
+
+cvd_host_package_tar := $(HOST_OUT)/cvd-host_package.tar.gz
+
+ifeq ($(HOST_OS),linux)
+CVD_TAR_FORMAT := --format=gnu
+endif
+
+# Build and store them on the build server.
+$(call dist-for-goals, dist_files, $(cvd_host_package_tar))
+
+bin_path := $(notdir $(HOST_OUT_EXECUTABLES))
+lib_path := $(notdir $(HOST_OUT_SHARED_LIBRARIES))
+tests_path := $(notdir $(HOST_OUT_NATIVE_TESTS))
+
+cvd_host_executables := \
+    launch_cvd \
+
+cvd_host_tests := \
+    auto_free_buffer_test \
+    circqueue_test \
+    cuttlefish_thread_test \
+    hald_client_test \
+    lock_test \
+    monotonic_time_test \
+    vsoc_graphics_test \
+
+cvd_host_shared_libraries := \
+    libc++ \
+    libicuuc-host \
+
+cvd_host_configs := \
+    vsoc_mem.json
+
+cvd_host_packages := \
+    vsoc_mem_json \
+    $(cvd_host_executables) \
+    $(cvd_host_tests) \
+
+cvd_host_package_files := \
+     $(addprefix config/,$(cvd_host_configs)) \
+     $(addprefix $(bin_path)/,$(cvd_host_executables)) \
+     $(addprefix $(lib_path)/,$(addsuffix .so,$(cvd_host_shared_libraries))) \
+     $(foreach test,$(cvd_host_tests), ${tests_path}/$(test)/$(test)) \
+
+$(cvd_host_package_tar): $(cvd_host_packages)
+	$(hide) rm -rf $@ && tar Scfz $@.tmp -C $(HOST_OUT) $(CVD_TAR_FORMAT) $(cvd_host_package_files)
+	$(hide) mv $@.tmp $@
diff --git a/shared/Android.mk b/shared/Android.mk
index b4b3c27ed..c605e76de 100644
--- a/shared/Android.mk
+++ b/shared/Android.mk
@@ -16,4 +16,3 @@
 
 LOCAL_PATH:= $(call my-dir)
 include $(call all-makefiles-under,$(LOCAL_PATH))
-$(call dist-for-goals, droidcore, $(CUTTLEFISH_KERNEL):kernel)
diff --git a/shared/BoardConfig.mk b/shared/BoardConfig.mk
index 3ff0d1c83..dfee74a83 100644
--- a/shared/BoardConfig.mk
+++ b/shared/BoardConfig.mk
@@ -52,20 +52,15 @@ BOARD_CACHEIMAGE_PARTITION_SIZE := 67108864
 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
 
 BOARD_KERNEL_CMDLINE := loop.max_part=7
-BOARD_KERNEL_CMDLINE += console=ttyS0 androidboot.console=ttyS0
-BOARD_KERNEL_CMDLINE += androidboot.hardware=vsoc CUTTLEFISH
+BOARD_KERNEL_CMDLINE += console=ttyS0 androidboot.console=ttyS1
+BOARD_KERNEL_CMDLINE += androidboot.hardware=vsoc
 BOARD_KERNEL_CMDLINE += enforcing=0 audit=1
 BOARD_KERNEL_CMDLINE += androidboot.selinux=permissive
+BOARD_KERNEL_CMDLINE += mac80211_hwsim.radios=0
 
 # TODO(b/65266349) Figure out why this is needed
 BOARD_KERNEL_CMDLINE += security=selinux
 
-# TODO(b/65254639) Use different serial numbers
-BOARD_KERNEL_CMDLINE += androidboot.serialno=CUTTLEFISHAVD01
-
-# TOOD(b/65254717) This needs to go away
-BOARD_KERNEL_CMDLINE += CUTTLEFISH
-
 # Minimum size of the final bootable disk image: 10G
 # GCE will pad disk images out to 10G. Our disk images should be at least as
 # big to avoid warnings about partition table oddities.
diff --git a/shared/config/init.vsoc.rc b/shared/config/init.vsoc.rc
index 225c3ea4d..7ffd63d6a 100644
--- a/shared/config/init.vsoc.rc
+++ b/shared/config/init.vsoc.rc
@@ -21,6 +21,12 @@ on early-init
     chmod 0755 /sys/kernel/debug
 
 
+on init
+    chown system root /dev/fb_broadcast
+    chmod 0660 /dev/fb_broadcast
+    restorecon /dev/fb_broadcast
+
+
 on fs
     mount_all /fstab.${ro.hardware}
     wait /vendor/etc/selinux/nonplat_mac_permissions.xml
@@ -73,7 +79,7 @@ service vnc_server /vendor/bin/vnc_server
     oneshot
 
 
-service seriallogging /system/bin/logcat -b all -v threadtime -f /dev/vport0p1 *:V
+service seriallogging /system/bin/logcat -b all -v threadtime -f /dev/cf-logcat *:V
     class main
     user root
     disabled
@@ -93,11 +99,20 @@ service gce_fs_monitor /vendor/bin/gce_fs_monitor
     oneshot
 
 
-service usbforward /vendor/bin/usbforward /dev/vport0p2
+service usbforward /vendor/bin/usbforward /dev/cf-gadget-usb-v1
     class late_start
     user root
 
 
+service wifirouter /vendor/bin/wifirouter
+    class main
+    user root
+
+
+service wificlient /vendor/bin/wificlient -iface=wlan0 -macaddr=00:43:56:44:01:02
+    class late_start
+    user root
+
 service bugreport /system/bin/dumpstate -d -p -B -z -o /sdcard/bugreport
     class main
     disabled
diff --git a/shared/device.mk b/shared/device.mk
index 5b3a87ab3..4a572de19 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -14,11 +14,7 @@
 # limitations under the License.
 #
 
-ifeq (,$(CUTTLEFISH_KERNEL))
-CUTTLEFISH_KERNEL := device/google/cuttlefish_kernel/4.4-x86_64/kernel
-endif
-
-PRODUCT_COPY_FILES += $(CUTTLEFISH_KERNEL):kernel
+PRODUCT_COPY_FILES += device/google/cuttlefish_kernel/4.4-x86_64/kernel:kernel
 
 # Explanation of specific properties:
 #   debug.hwui.swap_with_damage avoids boot failure on M http://b/25152138
@@ -63,6 +59,8 @@ PRODUCT_PACKAGES += \
     usbforward \
     vnc_server \
     VSoCService \
+    wifirouter \
+    wificlient \
     wpa_supplicant.vsoc.conf \
 
 #
diff --git a/shared/sepolicy/file_contexts b/shared/sepolicy/file_contexts
index f26904ffa..e931594e2 100644
--- a/shared/sepolicy/file_contexts
+++ b/shared/sepolicy/file_contexts
@@ -31,5 +31,7 @@
 /vendor/bin/usbforward  u:object_r:usbforward_exec:s0
 /vendor/bin/vnc_server  u:object_r:vnc_server_exec:s0
 /vendor/bin/vsoc_guest_region_e2e_test  u:object_r:vsoc_guest_region_e2e_test_exec:s0
+/vendor/bin/wificlient  u:object_r:wificlient_exec:s0
+/vendor/bin/wifirouter  u:object_r:wifirouter_exec:s0
 /vendor/bin/hw/android\.hardware\.bluetooth@1\.0-service\.sim             u:object_r:hal_bluetooth_sim_exec:s0
 /vendor/bin/hw/android\.hardware\.dumpstate@1\.0-service\.cuttlefish      u:object_r:hal_dumpstate_impl_exec:s0
diff --git a/shared/sepolicy/wificlient.te b/shared/sepolicy/wificlient.te
new file mode 100644
index 000000000..e0bb6992d
--- /dev/null
+++ b/shared/sepolicy/wificlient.te
@@ -0,0 +1,5 @@
+type wificlient, domain;
+type wificlient_exec, exec_type, file_type;
+
+init_daemon_domain(wificlient)
+allow wificlient self:netlink_kobject_uevent_socket create_socket_perms_no_ioctl;
diff --git a/shared/sepolicy/wifirouter.te b/shared/sepolicy/wifirouter.te
new file mode 100644
index 000000000..88317de9c
--- /dev/null
+++ b/shared/sepolicy/wifirouter.te
@@ -0,0 +1,5 @@
+type wifirouter, domain;
+type wifirouter_exec, exec_type, file_type;
+
+init_daemon_domain(wifirouter)
+allow wifirouter self:netlink_kobject_uevent_socket create_socket_perms_no_ioctl;
diff --git a/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
index f779270cd..2b7dfbeae 100644
--- a/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
@@ -44,7 +44,7 @@
   <bool name="config_showNavigationBar">true</bool>
   <dimen name="config_viewConfigurationTouchSlop">12dp</dimen>
   <integer name="config_mobile_mtu">1460</integer>
-  <!-- Cloud Android uses mac80211-hwsim, which does not support Preferred
+  <!-- cuttlefish uses mac80211-hwsim, which does not support Preferred
   Network Offload feature. We disable the use of this feature here. -->
   <bool translatable="false" name="config_wifi_background_scan_support">false</bool>
   <!--  Maximum number of supported users -->
diff --git a/vsoc_x86/tablet/overlay/frameworks/base/core/res/res/values/config.xml b/vsoc_x86/tablet/overlay/frameworks/base/core/res/res/values/config.xml
index a1c608f8d..5b29ae6ff 100644
--- a/vsoc_x86/tablet/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/vsoc_x86/tablet/overlay/frameworks/base/core/res/res/values/config.xml
@@ -36,7 +36,7 @@
   <bool name="config_showNavigationBar">true</bool>
   <dimen name="config_viewConfigurationTouchSlop">12dp</dimen>
 
-  <!-- Cloud Android uses mac80211-hwsim, which does not support Preferred
+  <!-- cuttlefish uses mac80211-hwsim, which does not support Preferred
   Network Offload feature. We disable the use of this feature here. -->
   <bool translatable="false" name="config_wifi_background_scan_support">false</bool>
 
diff --git a/vsoc_x86/tablet_3g/overlay/frameworks/base/core/res/res/values/config.xml b/vsoc_x86/tablet_3g/overlay/frameworks/base/core/res/res/values/config.xml
index 817352eaa..522712dda 100644
--- a/vsoc_x86/tablet_3g/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/vsoc_x86/tablet_3g/overlay/frameworks/base/core/res/res/values/config.xml
@@ -44,7 +44,7 @@
   <bool name="config_showNavigationBar">true</bool>
   <dimen name="config_viewConfigurationTouchSlop">12dp</dimen>
   <integer name="config_mobile_mtu">1460</integer>
-  <!-- Cloud Android uses mac80211-hwsim, which does not support Preferred
+  <!-- cuttlefish uses mac80211-hwsim, which does not support Preferred
   Network Offload feature. We disable the use of this feature here. -->
   <bool translatable="false" name="config_wifi_background_scan_support">false</bool>
   <!--  Maximum number of supported users -->
diff --git a/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
index be8c83646..f020ab22a 100644
--- a/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
@@ -44,7 +44,7 @@
   <bool name="config_showNavigationBar">true</bool>
   <dimen name="config_viewConfigurationTouchSlop">12dp</dimen>
   <integer name="config_mobile_mtu">1460</integer>
-  <!-- Cloud Android uses mac80211-hwsim, which does not support Preferred
+  <!-- cuttlefish uses mac80211-hwsim, which does not support Preferred
   Network Offload feature. We disable the use of this feature here. -->
   <bool translatable="false" name="config_wifi_background_scan_support">false</bool>
   <!--  Maximum number of supported users -->
diff --git a/vsoc_x86_64/tablet/overlay/frameworks/base/core/res/res/values/config.xml b/vsoc_x86_64/tablet/overlay/frameworks/base/core/res/res/values/config.xml
index a1c608f8d..5b29ae6ff 100644
--- a/vsoc_x86_64/tablet/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/vsoc_x86_64/tablet/overlay/frameworks/base/core/res/res/values/config.xml
@@ -36,7 +36,7 @@
   <bool name="config_showNavigationBar">true</bool>
   <dimen name="config_viewConfigurationTouchSlop">12dp</dimen>
 
-  <!-- Cloud Android uses mac80211-hwsim, which does not support Preferred
+  <!-- cuttlefish uses mac80211-hwsim, which does not support Preferred
   Network Offload feature. We disable the use of this feature here. -->
   <bool translatable="false" name="config_wifi_background_scan_support">false</bool>
 
diff --git a/vsoc_x86_64/tablet_3g/overlay/frameworks/base/core/res/res/values/config.xml b/vsoc_x86_64/tablet_3g/overlay/frameworks/base/core/res/res/values/config.xml
index 817352eaa..522712dda 100644
--- a/vsoc_x86_64/tablet_3g/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/vsoc_x86_64/tablet_3g/overlay/frameworks/base/core/res/res/values/config.xml
@@ -44,7 +44,7 @@
   <bool name="config_showNavigationBar">true</bool>
   <dimen name="config_viewConfigurationTouchSlop">12dp</dimen>
   <integer name="config_mobile_mtu">1460</integer>
-  <!-- Cloud Android uses mac80211-hwsim, which does not support Preferred
+  <!-- cuttlefish uses mac80211-hwsim, which does not support Preferred
   Network Offload feature. We disable the use of this feature here. -->
   <bool translatable="false" name="config_wifi_background_scan_support">false</bool>
   <!--  Maximum number of supported users -->