tag 2533cb9b5ed7940bea2718af1774a3646960546d tagger The Android Open Source Project <initial-contribution@android.com> Mon Jan 04 14:50:48 2016 -0800 object d5d55aa88603efdbc2d0cfa361d1d10279fc8329

Android 6.0.1 release 5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEABECAAYFAlaK90gACgkQ6K0/gZqxDngD2QCZAYZZu8aqLPuQkz13TagtKZyA 8mwAn1Cnix2JlvnkE5auVmZVR/VMOk03 =0E+u -----END PGP SIGNATURE-----

commit d5d55aa88603efdbc2d0cfa361d1d10279fc8329 log] tgz] author Kevin Cernekee <cernekee@google.com> Wed Dec 02 10:50:55 2015 -0800 committer The Android Automerger <android-build@google.com> Thu Dec 03 02:53:13 2015 -0800 tree f7b690791df1e80d7259d389210769bf06b1935c parent 2905239a43d9f38e45fb6987a95ce40b00e283f5 diff]

dragon: Use device/ makefiles to install supplicant_overlay.conf files Currently, this is how the overlay files get built into the image: device/google/dragon/device.mk says: $(call inherit-product-if-exists, vendor/google_devices/dragon/device-vendor.mk) vendor/google_devices/dragon/device-vendor.mk says: $(call inherit-product-if-exists, vendor/google_devices/dragon/firmware/bcm4354/device-bcm.mk) vendor/google_devices/dragon/firmware/bcm4354/device-bcm.mk includes this makefile: hardware/broadcom/wlan/bcmdhd/config/config-bcm.mk which installs: /system/etc/wifi/p2p_supplicant_overlay.conf /system/etc/wifi/wpa_supplicant_overlay.conf On AOSP builds, the vendor/ tree is replaced by a minimal version that only handles binary blobs. Therefore, we'll want device/google/dragon/device.mk to include the hardware/... makefile directly, instead of through vendor/... BUG=25870728 TEST=`rm -rf out` and then rebuild internal + AOSP trees Change-Id: I1e495c1badb875625f63f799b72b5ca290c3a8e5 Signed-off-by: Kevin Cernekee <cernekee@google.com>

1 file changed