commit d4f61a645497da2dae50a662402536c42f33fe33
author Michael Ryleev <gmar@google.com> Mon Jul 16 18:10:56 2018 -0700
committer Michael Ryleev <gmar@google.com> Wed Jul 25 15:23:52 2018 -0700
tree ce2706a42d83ca6bb24cda3442b16a2a687a8fb9
parent e5e8a6e2f52c029fbe4dc9088b62727d334631f8

Adjust overlays for new source tree layout

  lk/trusty    => trusty/kernel
  lk/nxp       => trusty/hardware/nxp
  app/XXX      => trusty/user/app/XXX
  lib          => trusty/user/base
  device       => trusty/device/XXX
  vendor/google/aosp => trusty/vendor/google/aosp

  system/keymaster is removed
  system/gatekeeper is removed
  hardware/libhardware is removed

  trusty/user overlay is added until all existing apps are updated.

  lk_inc.mk is changed to point to new location of lk_ink_aosp.mk.

Bug: 111521896

Change-Id: If7ae2f7aeef76dc32a82b8b4c3e41b70e5e23e71

lk_inc.mk

diff --git a/lk_inc.mk b/lk_inc.mk
index 68dd82a..7f30705 100644
--- a/lk_inc.mk
+++ b/lk_inc.mk
@@ -13,4 +13,4 @@
 # limitations under the License.
 #
 
-include vendor/google/aosp/lk_inc_aosp.mk
+include trusty/vendor/google/aosp/lk_inc_aosp.mk

lk_inc_aosp.mk

diff --git a/lk_inc_aosp.mk b/lk_inc_aosp.mk
index 9412bb6..0855a60 100644
--- a/lk_inc_aosp.mk
+++ b/lk_inc_aosp.mk
@@ -15,16 +15,14 @@
 
 LKROOT ?= external/lk
 
-LKINC ?=  lk/trusty \
+LKINC ?=  trusty/kernel \
           external/lk \
           external/headers \
-	  lk/nxp \
-          app \
-          lib \
-          device/arm/generic-arm64 \
-          device/arm/vexpress-a15 \
-          device/nxp/imx7d \
-          system/keymaster \
-          system/gatekeeper \
-          hardware/libhardware \
-          vendor/google/aosp \
+          trusty/hardware/nxp \
+          trusty/user \
+          trusty/user/app \
+          trusty/user/base \
+          trusty/device/arm/generic-arm64 \
+          trusty/device/arm/vexpress-a15 \
+          trusty/device/nxp/imx7d \
+          trusty/vendor/google/aosp \