Yes please. None of these are used in AOSP/Android. Unless Darren knows he'll be using this in the near future, we should bring them back.

We may still pick this up in AOSP but currently there is no active work. On the Chrome OS side I'd say do whatever works best, but please don't remove https://android.googlesource.com/platform/system/tpm/ yet.

The other three are artifacts of a mess-up during the initial move to AOSP and can be obliterated. They have never been used AFAIK.

we have no plans to touch any of the repos on the aosp side.  we're only importing the history back into CrOS and then we ignore the aosp repos entirely.

if things ever change on the aosp side, loop us back in so we can re-evaluate things.

sgtm

here's the rewritten merge:
  https://chromium.googlesource.com/chromiumos/platform2/+log/sandbox/vapier/tpm

it's about 175 commits:
- i filtered out Android.mk, MODULE_LICENSE_APACHE2, and NOTICE files
- threw away all the empty merge commits
- moved all the files in the history back to their subdirs from the start (not clear what history the AOSP started with)
- squashed one or two "typo" type fixes into the commit that caused the breakage

doing a diff between that final repo and the current aosp repo only shows the diff in the files i listed above.

When do we expect to do this move back to platform2?
And where are the corresponding ebuild changes tracked, btw?

i just posted CLs for the ebuilds & manifest

i can do the platform2 push as soon as people look at that sandbox history above and people think it looks OK :)

The sandbox history looks ok to me. I didn't trace all the squashed "typo" fixes - where exactly did they go to, but those 5 that I checked looked ok.

sorry, here's the delta of non-merge commits i squashed into the commit that broke it:
2016-04-25 14:29:31 -0700 Fix google-explicit-constructor warnings.
2016-04-13 13:13:16 -0700 Update MIPS policy
2016-03-28 17:23:04 -0700 trunks: Fix MIPS policy syscall names.
2016-03-04 10:56:44 -0800 Revert "Stop hardcoding the gtest path."
2016-03-03 11:26:20 -0800 Stop hardcoding the gtest path.
2015-10-30 15:38:00 -0700 trunks: Fix generator bug in handle serialization
2015-10-19 11:21:00 -0700 Fixed build breaks on ChromeOS
2015-10-16 16:36:53 -0700 attestation: Rename "chromeos" -> "brillo" in include paths and namespaces
2015-10-01 10:58:07 -0700 tpm_manager: Fix compiler error in MockTpmNvram

i'll prob do this on Mon next week

and pushed now

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/overlays/chromiumos-overlay/+/78ff59319fd88d37d640c0058ce65b5d9e8a69f3

commit 78ff59319fd88d37d640c0058ce65b5d9e8a69f3
Author: Mike Frysinger <vapier@chromium.org>
Date: Mon Dec 18 06:28:50 2017

attestation, tpm_manager, trunks: move back to platform2

We aren't getting this from AOSP anymore.

BUG= chromium:789863 
TEST=precq passes

Change-Id: I757223e135d5fd34184adf3e4769160f88d564d1
Reviewed-on: https://chromium-review.googlesource.com/802475
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Dan Erat <derat@chromium.org>

[modify] https://crrev.com/78ff59319fd88d37d640c0058ce65b5d9e8a69f3/chromeos-base/trunks/trunks-9999.ebuild
[modify] https://crrev.com/78ff59319fd88d37d640c0058ce65b5d9e8a69f3/chromeos-base/attestation/attestation-9999.ebuild
[modify] https://crrev.com/78ff59319fd88d37d640c0058ce65b5d9e8a69f3/chromeos-base/tpm_manager/tpm_manager-9999.ebuild

The following revision refers to this bug:
  https://chrome-internal.googlesource.com/chromeos/manifest-internal/+/46f837cc4d72a197c5526a452bf33d00c356213b

commit 46f837cc4d72a197c5526a452bf33d00c356213b
Author: Mike Frysinger <vapier@chromium.org>
Date: Mon Dec 18 20:01:04 2017

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/manifest/+/85e37a09204cfceb187e38fa520210860f5a1f5d

commit 85e37a09204cfceb187e38fa520210860f5a1f5d
Author: Mike Frysinger <vapier@chromium.org>
Date: Mon Dec 18 20:01:04 2017

tpm: move back to platform2

We aren't getting this from AOSP anymore.

BUG= chromium:789863 
TEST=precq passes

Change-Id: Ied36fb82b3a4652bfeb0692118e34034d72c4ee4
Reviewed-on: https://chromium-review.googlesource.com/802058
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Dan Erat <derat@chromium.org>

[modify] https://crrev.com/85e37a09204cfceb187e38fa520210860f5a1f5d/full.xml